← Back to branch summary

~ubuntu-branches/ubuntu/raring/eucalyptus/raring

« back to all changes in this revision

Viewing changes to clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusSoapHandler.java

  • Committer: Package Import Robot
  • Author(s): Brian Thomason
  • Date: 2011-11-29 13:17:52 UTC
  • mfrom: (1.2.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 185.
  • Revision ID: package-import@ubuntu.com-20111129131752-rq31al3ntutv2vvl
Tags: upstream-3.0.999beta1
Import upstream version 3.0.999beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusSoapHandler.java
53
53
 *    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
54
54
 *    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
55
55
 *    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
56
 
 *    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
 
56
 *    THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
57
57
 *    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
58
58
 *    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
59
59
 *    ANY SUCH LICENSES OR RIGHTS.
96
96
import com.eucalyptus.ws.EucalyptusRemoteFault;
97
97
import com.google.common.collect.Lists;
98
98
 
 
99
import edu.ucsb.eucalyptus.msgs.BaseMessage;
99
100
import edu.ucsb.eucalyptus.msgs.EucalyptusErrorMessageType;
100
101
import edu.ucsb.eucalyptus.msgs.EucalyptusMessage;
 
102
import edu.ucsb.eucalyptus.msgs.ExceptionResponseType;
101
103
import edu.ucsb.eucalyptus.msgs.WalrusErrorMessageType;
102
104
 
103
105
@ChannelPipelineCoverage("one")
153
155
                        final MappingHttpMessage httpMessage = ( MappingHttpMessage ) event.getMessage( );
154
156
                        if( httpMessage.getMessage( ) instanceof EucalyptusErrorMessageType ) {
155
157
                                EucalyptusErrorMessageType errorMessage = (EucalyptusErrorMessageType) httpMessage.getMessage( );
156
 
                                EucalyptusMessage errMsg = WalrusUtil.convertErrorMessage(errorMessage);
 
158
                                BaseMessage errMsg = WalrusUtil.convertErrorMessage(errorMessage);
157
159
                                if(errMsg instanceof WalrusErrorMessageType) {
158
160
                                        WalrusErrorMessageType walrusErrMsg = (WalrusErrorMessageType) errMsg;
159
161
                                        httpMessage.setSoapEnvelope( createFault( walrusErrMsg.getCode(), 
164
166
                                } else {
165
167
                                        httpMessage.setSoapEnvelope( Binding.createFault( errorMessage.getSource( ), errorMessage.getMessage( ), errorMessage.getStatusMessage( ) ) );
166
168
                                }
 
169
                        } else if( httpMessage.getMessage( ) instanceof ExceptionResponseType ) {
 
170
                          ExceptionResponseType errorMessage = (ExceptionResponseType) httpMessage.getMessage( );
 
171
        BaseMessage errMsg = WalrusUtil.convertErrorMessage(errorMessage);
 
172
        if(errMsg instanceof WalrusErrorMessageType) {
 
173
          WalrusErrorMessageType walrusErrMsg = (WalrusErrorMessageType) errMsg;
 
174
          httpMessage.setSoapEnvelope( createFault( walrusErrMsg.getCode(), 
 
175
              walrusErrMsg.getMessage(), 
 
176
              walrusErrMsg.getStatus().getReasonPhrase(), 
 
177
              walrusErrMsg.getResourceType(), 
 
178
              walrusErrMsg.getResource()));
 
179
        }
167
180
                        } else {
168
181
                                // :: assert sourceElem != null :://
169
182
                                httpMessage.setSoapEnvelope( HoldMe.getOMSOAP11Factory( ).getDefaultEnvelope( ) );