← Back to branch summary

~ubuntu-virt/ubuntu/maverick/eucalyptus/2.0

« back to all changes in this revision

Viewing changes to clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/DNSReplyQueue.java

  • Committer: Dave Walker (Daviey)
  • Date: 2010-06-21 12:59:20 UTC
  • mfrom: (1048.1.14 ubuntu)
  • Revision ID: davewalker@ubuntu.com-20100621125920-60uhixwq174elnj1
* New major upstream version merge, 1.7 (r1200).
* debian/patches/:
  - 02-Makefile.patch: Updated to reflect new code layout.
  - 07-local_support_euca_conf-in.patch: Updated to reflect new code layout.
  - 08-ubuntu-default-networking.patch: Refreshed.
  - 09-small-128-192MB.patch: Updated to point to new location.
  - 10-disable-iscsi.patch: Refreshed.
  - 11-state-cleanup-memleakfix.patch: Refreshed.
  - 15-fix-default-ramdisk.patch: Updated to point to new location.
  - 16-kvm_libvirt_xml_default_use_kvm.patch: Updated to reflect changes.
  - 17-fix_walrus_OOM_errors.patch: Removed, fixed upstream.
  - 18-priv_security.patch: Updated to reflect upstream changes.
  - 20-brute-force-webui.patch: Updated to reflect upstream changes. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/DNSReplyQueue.java
67
67
 
68
68
import edu.ucsb.eucalyptus.cloud.*;
69
69
import edu.ucsb.eucalyptus.msgs.EucalyptusErrorMessageType;
70
 
import edu.ucsb.eucalyptus.msgs.EucalyptusMessage;
 
70
import edu.ucsb.eucalyptus.msgs.BaseMessage;
71
71
import edu.ucsb.eucalyptus.msgs.StorageErrorMessageType;
72
72
import edu.ucsb.eucalyptus.util.ReplyCoordinator;
73
73
import org.apache.log4j.Logger;
74
74
import org.mule.message.ExceptionMessage;
75
75
 
76
 
import com.eucalyptus.ws.binding.BindingManager;
 
76
import com.eucalyptus.binding.BindingManager;
77
77
 
78
78
public class DNSReplyQueue {
79
79
 
81
81
 
82
82
    private static ReplyCoordinator replies = new ReplyCoordinator( 3600000 );
83
83
 
84
 
    public void handle( EucalyptusMessage msg )
 
84
    public void handle( BaseMessage msg )
85
85
    {
86
86
        Logger.getLogger( DNSReplyQueue.class ).warn( "storage queueing reply to " + msg.getCorrelationId() );
87
87
        replies.putMessage( msg );
93
93
        {
94
94
            Object requestMsg = muleMsg.getPayload();
95
95
            String requestString = requestMsg.toString();
96
 
            EucalyptusMessage msg = ( EucalyptusMessage ) BindingManager.getBinding( "msgs_eucalyptus_ucsb_edu" ).fromOM( requestString );
 
96
            BaseMessage msg = ( BaseMessage ) BindingManager.getBinding( "msgs_eucalyptus_com" ).fromOM( requestString );
97
97
            Throwable ex = muleMsg.getException().getCause();
98
 
            EucalyptusMessage errMsg;
 
98
            BaseMessage errMsg;
99
99
 
100
100
 
101
101
            errMsg = new EucalyptusErrorMessageType( muleMsg.getComponentName() , msg, ex.getMessage());
108
108
        }
109
109
    }
110
110
 
111
 
    public static EucalyptusMessage getReply( String msgId )
 
111
    public static BaseMessage getReply( String msgId )
112
112
    {
113
113
        Logger.getLogger( DNSReplyQueue.class ).warn( "dns request for reply to " + msgId );
114
 
        EucalyptusMessage msg = replies.getMessage( msgId );
 
114
        BaseMessage msg = replies.getMessage( msgId );
115
115
        Logger.getLogger( DNSReplyQueue.class ).warn( "dns obtained reply to " + msgId );
116
116
        return msg;
117
117
    }