You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/12/12 22:01:44 UTC

[44/48] All Checkstyle problems corrected

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/context/CallContext.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/context/CallContext.java b/api/src/org/apache/cloudstack/context/CallContext.java
index 2d5aea4..dbeb5c7 100644
--- a/api/src/org/apache/cloudstack/context/CallContext.java
+++ b/api/src/org/apache/cloudstack/context/CallContext.java
@@ -42,10 +42,10 @@ public class CallContext {
     private static final Logger s_logger = Logger.getLogger(CallContext.class);
     private static ManagedThreadLocal<CallContext> s_currentContext = new ManagedThreadLocal<CallContext>();
     private static ManagedThreadLocal<Stack<CallContext>> s_currentContextStack = new ManagedThreadLocal<Stack<CallContext>>() {
-                @Override
-                protected Stack<CallContext> initialValue() {
-                    return new Stack<CallContext>();
-                }
+        @Override
+        protected Stack<CallContext> initialValue() {
+            return new Stack<CallContext>();
+        }
     };
 
     private String contextId;
@@ -76,9 +76,9 @@ public class CallContext {
 
     protected CallContext(User user, Account account, String contextId) {
         this.user = user;
-        this.userId = user.getId();
+        userId = user.getId();
         this.account = account;
-        this.accountId = account.getId();
+        accountId = account.getId();
         this.contextId = contextId;
     }
 
@@ -119,7 +119,7 @@ public class CallContext {
     /**
      * This method should only be called if you can propagate the context id
      * from another CallContext.
-     * 
+     *
      * @param callingUser calling user
      * @param callingAccount calling account
      * @param contextId context id propagated from another call context
@@ -132,7 +132,6 @@ public class CallContext {
     protected static CallContext register(User callingUser, Account callingAccount, Long userId, Long accountId, String contextId) {
         /*
                 Unit tests will have multiple times of setup/tear-down call to this, remove assertions to all unit test to run
-                 
                 assert s_currentContext.get() == null : "There's a context already so what does this new register context mean? " + s_currentContext.get().toString();
                 if (s_currentContext.get() != null) { // FIXME: This should be removed soon.  I added this check only to surface all the places that have this problem.
                     throw new CloudRuntimeException("There's a context already so what does this new register context mean? " + s_currentContext.get().toString());
@@ -149,9 +148,9 @@ public class CallContext {
         if (s_logger.isTraceEnabled()) {
             s_logger.trace("Registered: " + callingContext);
         }
-        
+
         s_currentContextStack.get().push(callingContext);
-        
+
         return callingContext;
     }
 
@@ -197,7 +196,7 @@ public class CallContext {
         }
         return register(user, account);
     }
-    
+
     public static CallContext register(long callingUserId, long callingAccountId, String contextId) throws CloudAuthenticationException {
         Account account = s_entityMgr.findById(Account.class, callingAccountId);
         if (account == null) {
@@ -215,7 +214,7 @@ public class CallContext {
             // NOOP
         }
     }
-    
+
     public static CallContext unregister() {
         CallContext context = s_currentContext.get();
         if (context == null) {
@@ -274,7 +273,7 @@ public class CallContext {
     public String getEventDetails() {
         return eventDetails;
     }
-    
+
     public String getEventType() {
         return eventType;
     }
@@ -282,7 +281,7 @@ public class CallContext {
     public void setEventType(String eventType) {
         this.eventType = eventType;
     }
-    
+
     public String getEventDescription() {
         return eventDescription;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java b/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
index 195486a..121659b 100644
--- a/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
@@ -67,7 +67,8 @@ public class AddIpToVmNicTest extends TestCase {
         AddIpToVmNicCmd ipTonicCmd = Mockito.mock(AddIpToVmNicCmd.class);
         NicSecondaryIp secIp = Mockito.mock(NicSecondaryIp.class);
 
-        Mockito.when(networkService.allocateSecondaryGuestIP(Matchers.any(Account.class), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyString()))
+        Mockito.when(
+            networkService.allocateSecondaryGuestIP(Matchers.any(Account.class), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyString()))
             .thenReturn(secIp);
 
         ipTonicCmd._networkService = networkService;
@@ -86,7 +87,8 @@ public class AddIpToVmNicTest extends TestCase {
         NetworkService networkService = Mockito.mock(NetworkService.class);
         AddIpToVmNicCmd ipTonicCmd = Mockito.mock(AddIpToVmNicCmd.class);
 
-        Mockito.when(networkService.allocateSecondaryGuestIP(Matchers.any(Account.class), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyString()))
+        Mockito.when(
+            networkService.allocateSecondaryGuestIP(Matchers.any(Account.class), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyString()))
             .thenReturn(null);
 
         ipTonicCmd._networkService = networkService;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java b/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
index e04952a..302644c 100644
--- a/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
+++ b/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
@@ -59,7 +59,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describePlacementGroupsResponse289 =
 
-                    skel.describePlacementGroups(wrappedParam);
+                        skel.describePlacementGroups(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describePlacementGroupsResponse289, false);
                 } else
@@ -73,7 +73,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createSecurityGroupResponse291 =
 
-                    skel.createSecurityGroup(wrappedParam);
+                        skel.createSecurityGroup(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createSecurityGroupResponse291, false);
                 } else
@@ -87,7 +87,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     resetNetworkInterfaceAttributeResponse293 =
 
-                    skel.resetNetworkInterfaceAttribute(wrappedParam);
+                        skel.resetNetworkInterfaceAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), resetNetworkInterfaceAttributeResponse293, false);
                 } else
@@ -101,7 +101,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createDhcpOptionsResponse295 =
 
-                    skel.createDhcpOptions(wrappedParam);
+                        skel.createDhcpOptions(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createDhcpOptionsResponse295, false);
                 } else
@@ -115,7 +115,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createRouteTableResponse297 =
 
-                    skel.createRouteTable(wrappedParam);
+                        skel.createRouteTable(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createRouteTableResponse297, false);
                 } else
@@ -129,7 +129,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeSubnetsResponse299 =
 
-                    skel.describeSubnets(wrappedParam);
+                        skel.describeSubnets(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeSubnetsResponse299, false);
                 } else
@@ -143,7 +143,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deactivateLicenseResponse301 =
 
-                    skel.deactivateLicense(wrappedParam);
+                        skel.deactivateLicense(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deactivateLicenseResponse301, false);
                 } else
@@ -157,7 +157,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteVpcResponse303 =
 
-                    skel.deleteVpc(wrappedParam);
+                        skel.deleteVpc(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpcResponse303, false);
                 } else
@@ -171,7 +171,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     cancelSpotInstanceRequestsResponse305 =
 
-                    skel.cancelSpotInstanceRequests(wrappedParam);
+                        skel.cancelSpotInstanceRequests(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), cancelSpotInstanceRequestsResponse305, false);
                 } else
@@ -185,7 +185,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createSubnetResponse307 =
 
-                    skel.createSubnet(wrappedParam);
+                        skel.createSubnet(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createSubnetResponse307, false);
                 } else
@@ -199,7 +199,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteVpnGatewayResponse309 =
 
-                    skel.deleteVpnGateway(wrappedParam);
+                        skel.deleteVpnGateway(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpnGatewayResponse309, false);
                 } else
@@ -213,7 +213,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createNetworkAclEntryResponse311 =
 
-                    skel.createNetworkAclEntry(wrappedParam);
+                        skel.createNetworkAclEntry(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createNetworkAclEntryResponse311, false);
                 } else
@@ -227,7 +227,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     requestSpotInstancesResponse313 =
 
-                    skel.requestSpotInstances(wrappedParam);
+                        skel.requestSpotInstances(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), requestSpotInstancesResponse313, false);
                 } else
@@ -241,7 +241,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeVolumeAttributeResponse315 =
 
-                    skel.describeVolumeAttribute(wrappedParam);
+                        skel.describeVolumeAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeVolumeAttributeResponse315, false);
                 } else
@@ -255,7 +255,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     associateDhcpOptionsResponse317 =
 
-                    skel.associateDhcpOptions(wrappedParam);
+                        skel.associateDhcpOptions(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), associateDhcpOptionsResponse317, false);
                 } else
@@ -269,7 +269,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeTagsResponse319 =
 
-                    skel.describeTags(wrappedParam);
+                        skel.describeTags(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeTagsResponse319, false);
                 } else
@@ -283,7 +283,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     importKeyPairResponse321 =
 
-                    skel.importKeyPair(wrappedParam);
+                        skel.importKeyPair(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), importKeyPairResponse321, false);
                 } else
@@ -297,7 +297,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteNetworkInterfaceResponse323 =
 
-                    skel.deleteNetworkInterface(wrappedParam);
+                        skel.deleteNetworkInterface(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteNetworkInterfaceResponse323, false);
                 } else
@@ -311,7 +311,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeVpcsResponse325 =
 
-                    skel.describeVpcs(wrappedParam);
+                        skel.describeVpcs(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeVpcsResponse325, false);
                 } else
@@ -325,7 +325,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeLicensesResponse327 =
 
-                    skel.describeLicenses(wrappedParam);
+                        skel.describeLicenses(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeLicensesResponse327, false);
                 } else
@@ -339,7 +339,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     bundleInstanceResponse329 =
 
-                    skel.bundleInstance(wrappedParam);
+                        skel.bundleInstance(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), bundleInstanceResponse329, false);
                 } else
@@ -353,7 +353,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeVpnConnectionsResponse331 =
 
-                    skel.describeVpnConnections(wrappedParam);
+                        skel.describeVpnConnections(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeVpnConnectionsResponse331, false);
                 } else
@@ -367,7 +367,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeImagesResponse333 =
 
-                    skel.describeImages(wrappedParam);
+                        skel.describeImages(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeImagesResponse333, false);
                 } else
@@ -381,7 +381,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createInternetGatewayResponse335 =
 
-                    skel.createInternetGateway(wrappedParam);
+                        skel.createInternetGateway(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createInternetGatewayResponse335, false);
                 } else
@@ -395,7 +395,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     disassociateRouteTableResponse337 =
 
-                    skel.disassociateRouteTable(wrappedParam);
+                        skel.disassociateRouteTable(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), disassociateRouteTableResponse337, false);
                 } else
@@ -409,7 +409,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     replaceNetworkAclEntryResponse339 =
 
-                    skel.replaceNetworkAclEntry(wrappedParam);
+                        skel.replaceNetworkAclEntry(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), replaceNetworkAclEntryResponse339, false);
                 } else
@@ -423,7 +423,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     authorizeSecurityGroupIngressResponse341 =
 
-                    skel.authorizeSecurityGroupIngress(wrappedParam);
+                        skel.authorizeSecurityGroupIngress(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), authorizeSecurityGroupIngressResponse341, false);
                 } else
@@ -437,7 +437,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeSnapshotAttributeResponse343 =
 
-                    skel.describeSnapshotAttribute(wrappedParam);
+                        skel.describeSnapshotAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeSnapshotAttributeResponse343, false);
                 } else
@@ -451,7 +451,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createVpnGatewayResponse345 =
 
-                    skel.createVpnGateway(wrappedParam);
+                        skel.createVpnGateway(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createVpnGatewayResponse345, false);
                 } else
@@ -465,7 +465,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     resetInstanceAttributeResponse347 =
 
-                    skel.resetInstanceAttribute(wrappedParam);
+                        skel.resetInstanceAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), resetInstanceAttributeResponse347, false);
                 } else
@@ -479,7 +479,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createTagsResponse349 =
 
-                    skel.createTags(wrappedParam);
+                        skel.createTags(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createTagsResponse349, false);
                 } else
@@ -493,7 +493,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     authorizeSecurityGroupEgressResponse351 =
 
-                    skel.authorizeSecurityGroupEgress(wrappedParam);
+                        skel.authorizeSecurityGroupEgress(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), authorizeSecurityGroupEgressResponse351, false);
                 } else
@@ -507,7 +507,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     associateAddressResponse353 =
 
-                    skel.associateAddress(wrappedParam);
+                        skel.associateAddress(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), associateAddressResponse353, false);
                 } else
@@ -521,7 +521,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeImageAttributeResponse355 =
 
-                    skel.describeImageAttribute(wrappedParam);
+                        skel.describeImageAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeImageAttributeResponse355, false);
                 } else
@@ -535,7 +535,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeSpotPriceHistoryResponse357 =
 
-                    skel.describeSpotPriceHistory(wrappedParam);
+                        skel.describeSpotPriceHistory(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotPriceHistoryResponse357, false);
                 } else
@@ -549,7 +549,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     modifySnapshotAttributeResponse359 =
 
-                    skel.modifySnapshotAttribute(wrappedParam);
+                        skel.modifySnapshotAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), modifySnapshotAttributeResponse359, false);
                 } else
@@ -563,7 +563,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeSpotInstanceRequestsResponse361 =
 
-                    skel.describeSpotInstanceRequests(wrappedParam);
+                        skel.describeSpotInstanceRequests(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotInstanceRequestsResponse361, false);
                 } else
@@ -577,7 +577,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     importInstanceResponse363 =
 
-                    skel.importInstance(wrappedParam);
+                        skel.importInstance(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), importInstanceResponse363, false);
                 } else
@@ -591,7 +591,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeKeyPairsResponse365 =
 
-                    skel.describeKeyPairs(wrappedParam);
+                        skel.describeKeyPairs(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeKeyPairsResponse365, false);
                 } else
@@ -605,7 +605,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     revokeSecurityGroupIngressResponse367 =
 
-                    skel.revokeSecurityGroupIngress(wrappedParam);
+                        skel.revokeSecurityGroupIngress(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), revokeSecurityGroupIngressResponse367, false);
                 } else
@@ -619,7 +619,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createPlacementGroupResponse369 =
 
-                    skel.createPlacementGroup(wrappedParam);
+                        skel.createPlacementGroup(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createPlacementGroupResponse369, false);
                 } else
@@ -633,7 +633,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteNetworkAclEntryResponse371 =
 
-                    skel.deleteNetworkAclEntry(wrappedParam);
+                        skel.deleteNetworkAclEntry(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteNetworkAclEntryResponse371, false);
                 } else
@@ -647,7 +647,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     activateLicenseResponse373 =
 
-                    skel.activateLicense(wrappedParam);
+                        skel.activateLicense(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), activateLicenseResponse373, false);
                 } else
@@ -661,7 +661,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteRouteTableResponse375 =
 
-                    skel.deleteRouteTable(wrappedParam);
+                        skel.deleteRouteTable(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteRouteTableResponse375, false);
                 } else
@@ -675,7 +675,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     unmonitorInstancesResponse377 =
 
-                    skel.unmonitorInstances(wrappedParam);
+                        skel.unmonitorInstances(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), unmonitorInstancesResponse377, false);
                 } else
@@ -689,7 +689,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     startInstancesResponse379 =
 
-                    skel.startInstances(wrappedParam);
+                        skel.startInstances(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), startInstancesResponse379, false);
                 } else
@@ -703,7 +703,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     confirmProductInstanceResponse381 =
 
-                    skel.confirmProductInstance(wrappedParam);
+                        skel.confirmProductInstance(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), confirmProductInstanceResponse381, false);
                 } else
@@ -717,7 +717,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeNetworkInterfaceAttributeResponse383 =
 
-                    skel.describeNetworkInterfaceAttribute(wrappedParam);
+                        skel.describeNetworkInterfaceAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeNetworkInterfaceAttributeResponse383, false);
                 } else
@@ -731,7 +731,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     runInstancesResponse385 =
 
-                    skel.runInstances(wrappedParam);
+                        skel.runInstances(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), runInstancesResponse385, false);
                 } else
@@ -745,7 +745,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createReservedInstancesListingResponse387 =
 
-                    skel.createReservedInstancesListing(wrappedParam);
+                        skel.createReservedInstancesListing(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createReservedInstancesListingResponse387, false);
                 } else
@@ -759,7 +759,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createCustomerGatewayResponse389 =
 
-                    skel.createCustomerGateway(wrappedParam);
+                        skel.createCustomerGateway(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createCustomerGatewayResponse389, false);
                 } else
@@ -773,7 +773,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createNetworkAclResponse391 =
 
-                    skel.createNetworkAcl(wrappedParam);
+                        skel.createNetworkAcl(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createNetworkAclResponse391, false);
                 } else
@@ -787,7 +787,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     resetImageAttributeResponse393 =
 
-                    skel.resetImageAttribute(wrappedParam);
+                        skel.resetImageAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), resetImageAttributeResponse393, false);
                 } else
@@ -801,7 +801,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     modifyVolumeAttributeResponse395 =
 
-                    skel.modifyVolumeAttribute(wrappedParam);
+                        skel.modifyVolumeAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), modifyVolumeAttributeResponse395, false);
                 } else
@@ -815,7 +815,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeReservedInstancesResponse397 =
 
-                    skel.describeReservedInstances(wrappedParam);
+                        skel.describeReservedInstances(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeReservedInstancesResponse397, false);
                 } else
@@ -829,7 +829,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     resetSnapshotAttributeResponse399 =
 
-                    skel.resetSnapshotAttribute(wrappedParam);
+                        skel.resetSnapshotAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), resetSnapshotAttributeResponse399, false);
                 } else
@@ -843,7 +843,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteVolumeResponse401 =
 
-                    skel.deleteVolume(wrappedParam);
+                        skel.deleteVolume(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteVolumeResponse401, false);
                 } else
@@ -857,7 +857,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeAvailabilityZonesResponse403 =
 
-                    skel.describeAvailabilityZones(wrappedParam);
+                        skel.describeAvailabilityZones(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeAvailabilityZonesResponse403, false);
                 } else
@@ -871,7 +871,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createVpnConnectionResponse405 =
 
-                    skel.createVpnConnection(wrappedParam);
+                        skel.createVpnConnection(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createVpnConnectionResponse405, false);
                 } else
@@ -885,7 +885,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     cancelBundleTaskResponse407 =
 
-                    skel.cancelBundleTask(wrappedParam);
+                        skel.cancelBundleTask(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), cancelBundleTaskResponse407, false);
                 } else
@@ -899,7 +899,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     replaceNetworkAclAssociationResponse409 =
 
-                    skel.replaceNetworkAclAssociation(wrappedParam);
+                        skel.replaceNetworkAclAssociation(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), replaceNetworkAclAssociationResponse409, false);
                 } else
@@ -913,7 +913,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     detachVpnGatewayResponse411 =
 
-                    skel.detachVpnGateway(wrappedParam);
+                        skel.detachVpnGateway(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), detachVpnGatewayResponse411, false);
                 } else
@@ -927,7 +927,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeSnapshotsResponse413 =
 
-                    skel.describeSnapshots(wrappedParam);
+                        skel.describeSnapshots(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeSnapshotsResponse413, false);
                 } else
@@ -941,7 +941,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteSubnetResponse415 =
 
-                    skel.deleteSubnet(wrappedParam);
+                        skel.deleteSubnet(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteSubnetResponse415, false);
                 } else
@@ -955,7 +955,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeBundleTasksResponse417 =
 
-                    skel.describeBundleTasks(wrappedParam);
+                        skel.describeBundleTasks(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeBundleTasksResponse417, false);
                 } else
@@ -969,7 +969,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createKeyPairResponse419 =
 
-                    skel.createKeyPair(wrappedParam);
+                        skel.createKeyPair(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createKeyPairResponse419, false);
                 } else
@@ -983,7 +983,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createImageResponse421 =
 
-                    skel.createImage(wrappedParam);
+                        skel.createImage(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createImageResponse421, false);
                 } else
@@ -997,7 +997,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     enableVgwRoutePropagationResponse423 =
 
-                    skel.enableVgwRoutePropagation(wrappedParam);
+                        skel.enableVgwRoutePropagation(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), enableVgwRoutePropagationResponse423, false);
                 } else
@@ -1011,7 +1011,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     unassignPrivateIpAddressesResponse425 =
 
-                    skel.unassignPrivateIpAddresses(wrappedParam);
+                        skel.unassignPrivateIpAddresses(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), unassignPrivateIpAddressesResponse425, false);
                 } else
@@ -1025,7 +1025,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deregisterImageResponse427 =
 
-                    skel.deregisterImage(wrappedParam);
+                        skel.deregisterImage(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deregisterImageResponse427, false);
                 } else
@@ -1039,7 +1039,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteVpnConnectionRouteResponse429 =
 
-                    skel.deleteVpnConnectionRoute(wrappedParam);
+                        skel.deleteVpnConnectionRoute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpnConnectionRouteResponse429, false);
                 } else
@@ -1053,7 +1053,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     modifyImageAttributeResponse431 =
 
-                    skel.modifyImageAttribute(wrappedParam);
+                        skel.modifyImageAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), modifyImageAttributeResponse431, false);
                 } else
@@ -1067,7 +1067,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     cancelConversionTaskResponse433 =
 
-                    skel.cancelConversionTask(wrappedParam);
+                        skel.cancelConversionTask(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), cancelConversionTaskResponse433, false);
                 } else
@@ -1081,7 +1081,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeVolumesResponse435 =
 
-                    skel.describeVolumes(wrappedParam);
+                        skel.describeVolumes(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeVolumesResponse435, false);
                 } else
@@ -1095,7 +1095,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     cancelReservedInstancesListingResponse437 =
 
-                    skel.cancelReservedInstancesListing(wrappedParam);
+                        skel.cancelReservedInstancesListing(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), cancelReservedInstancesListingResponse437, false);
                 } else
@@ -1109,7 +1109,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     getPasswordDataResponse439 =
 
-                    skel.getPasswordData(wrappedParam);
+                        skel.getPasswordData(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), getPasswordDataResponse439, false);
                 } else
@@ -1123,7 +1123,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     allocateAddressResponse441 =
 
-                    skel.allocateAddress(wrappedParam);
+                        skel.allocateAddress(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), allocateAddressResponse441, false);
                 } else
@@ -1137,7 +1137,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteSecurityGroupResponse443 =
 
-                    skel.deleteSecurityGroup(wrappedParam);
+                        skel.deleteSecurityGroup(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteSecurityGroupResponse443, false);
                 } else
@@ -1151,7 +1151,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deletePlacementGroupResponse445 =
 
-                    skel.deletePlacementGroup(wrappedParam);
+                        skel.deletePlacementGroup(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deletePlacementGroupResponse445, false);
                 } else
@@ -1165,7 +1165,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     disassociateAddressResponse447 =
 
-                    skel.disassociateAddress(wrappedParam);
+                        skel.disassociateAddress(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), disassociateAddressResponse447, false);
                 } else
@@ -1179,7 +1179,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteDhcpOptionsResponse449 =
 
-                    skel.deleteDhcpOptions(wrappedParam);
+                        skel.deleteDhcpOptions(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteDhcpOptionsResponse449, false);
                 } else
@@ -1193,7 +1193,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeSpotDatafeedSubscriptionResponse451 =
 
-                    skel.describeSpotDatafeedSubscription(wrappedParam);
+                        skel.describeSpotDatafeedSubscription(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotDatafeedSubscriptionResponse451, false);
                 } else
@@ -1207,7 +1207,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeNetworkAclsResponse453 =
 
-                    skel.describeNetworkAcls(wrappedParam);
+                        skel.describeNetworkAcls(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeNetworkAclsResponse453, false);
                 } else
@@ -1221,7 +1221,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     enableVolumeIOResponse455 =
 
-                    skel.enableVolumeIO(wrappedParam);
+                        skel.enableVolumeIO(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), enableVolumeIOResponse455, false);
                 } else
@@ -1235,7 +1235,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     attachVpnGatewayResponse457 =
 
-                    skel.attachVpnGateway(wrappedParam);
+                        skel.attachVpnGateway(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), attachVpnGatewayResponse457, false);
                 } else
@@ -1249,7 +1249,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeInternetGatewaysResponse459 =
 
-                    skel.describeInternetGateways(wrappedParam);
+                        skel.describeInternetGateways(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeInternetGatewaysResponse459, false);
                 } else
@@ -1263,7 +1263,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeDhcpOptionsResponse461 =
 
-                    skel.describeDhcpOptions(wrappedParam);
+                        skel.describeDhcpOptions(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeDhcpOptionsResponse461, false);
                 } else
@@ -1277,7 +1277,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createSpotDatafeedSubscriptionResponse463 =
 
-                    skel.createSpotDatafeedSubscription(wrappedParam);
+                        skel.createSpotDatafeedSubscription(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createSpotDatafeedSubscriptionResponse463, false);
                 } else
@@ -1291,7 +1291,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeReservedInstancesListingsResponse465 =
 
-                    skel.describeReservedInstancesListings(wrappedParam);
+                        skel.describeReservedInstancesListings(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeReservedInstancesListingsResponse465, false);
                 } else
@@ -1305,7 +1305,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeInstanceStatusResponse467 =
 
-                    skel.describeInstanceStatus(wrappedParam);
+                        skel.describeInstanceStatus(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeInstanceStatusResponse467, false);
                 } else
@@ -1319,7 +1319,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     modifyNetworkInterfaceAttributeResponse469 =
 
-                    skel.modifyNetworkInterfaceAttribute(wrappedParam);
+                        skel.modifyNetworkInterfaceAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), modifyNetworkInterfaceAttributeResponse469, false);
                 } else
@@ -1333,7 +1333,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     disableVgwRoutePropagationResponse471 =
 
-                    skel.disableVgwRoutePropagation(wrappedParam);
+                        skel.disableVgwRoutePropagation(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), disableVgwRoutePropagationResponse471, false);
                 } else
@@ -1347,7 +1347,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeVolumeStatusResponse473 =
 
-                    skel.describeVolumeStatus(wrappedParam);
+                        skel.describeVolumeStatus(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeVolumeStatusResponse473, false);
                 } else
@@ -1361,7 +1361,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     detachNetworkInterfaceResponse475 =
 
-                    skel.detachNetworkInterface(wrappedParam);
+                        skel.detachNetworkInterface(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), detachNetworkInterfaceResponse475, false);
                 } else
@@ -1375,7 +1375,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeSecurityGroupsResponse477 =
 
-                    skel.describeSecurityGroups(wrappedParam);
+                        skel.describeSecurityGroups(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeSecurityGroupsResponse477, false);
                 } else
@@ -1389,7 +1389,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeInstancesResponse479 =
 
-                    skel.describeInstances(wrappedParam);
+                        skel.describeInstances(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeInstancesResponse479, false);
                 } else
@@ -1403,7 +1403,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeNetworkInterfacesResponse481 =
 
-                    skel.describeNetworkInterfaces(wrappedParam);
+                        skel.describeNetworkInterfaces(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeNetworkInterfacesResponse481, false);
                 } else
@@ -1417,7 +1417,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteKeyPairResponse483 =
 
-                    skel.deleteKeyPair(wrappedParam);
+                        skel.deleteKeyPair(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteKeyPairResponse483, false);
                 } else
@@ -1431,7 +1431,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createSnapshotResponse485 =
 
-                    skel.createSnapshot(wrappedParam);
+                        skel.createSnapshot(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createSnapshotResponse485, false);
                 } else
@@ -1445,7 +1445,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeVpnGatewaysResponse487 =
 
-                    skel.describeVpnGateways(wrappedParam);
+                        skel.describeVpnGateways(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeVpnGatewaysResponse487, false);
                 } else
@@ -1459,7 +1459,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteTagsResponse489 =
 
-                    skel.deleteTags(wrappedParam);
+                        skel.deleteTags(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteTagsResponse489, false);
                 } else
@@ -1473,7 +1473,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteSnapshotResponse491 =
 
-                    skel.deleteSnapshot(wrappedParam);
+                        skel.deleteSnapshot(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteSnapshotResponse491, false);
                 } else
@@ -1487,7 +1487,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteCustomerGatewayResponse493 =
 
-                    skel.deleteCustomerGateway(wrappedParam);
+                        skel.deleteCustomerGateway(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteCustomerGatewayResponse493, false);
                 } else
@@ -1501,7 +1501,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createVolumeResponse495 =
 
-                    skel.createVolume(wrappedParam);
+                        skel.createVolume(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createVolumeResponse495, false);
                 } else
@@ -1515,7 +1515,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     cancelExportTaskResponse497 =
 
-                    skel.cancelExportTask(wrappedParam);
+                        skel.cancelExportTask(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), cancelExportTaskResponse497, false);
                 } else
@@ -1529,7 +1529,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     registerImageResponse499 =
 
-                    skel.registerImage(wrappedParam);
+                        skel.registerImage(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), registerImageResponse499, false);
                 } else
@@ -1543,7 +1543,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     detachVolumeResponse501 =
 
-                    skel.detachVolume(wrappedParam);
+                        skel.detachVolume(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), detachVolumeResponse501, false);
                 } else
@@ -1557,7 +1557,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     stopInstancesResponse503 =
 
-                    skel.stopInstances(wrappedParam);
+                        skel.stopInstances(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), stopInstancesResponse503, false);
                 } else
@@ -1571,7 +1571,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createRouteResponse505 =
 
-                    skel.createRoute(wrappedParam);
+                        skel.createRoute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createRouteResponse505, false);
                 } else
@@ -1585,7 +1585,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     releaseAddressResponse507 =
 
-                    skel.releaseAddress(wrappedParam);
+                        skel.releaseAddress(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), releaseAddressResponse507, false);
                 } else
@@ -1599,7 +1599,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeRouteTablesResponse509 =
 
-                    skel.describeRouteTables(wrappedParam);
+                        skel.describeRouteTables(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeRouteTablesResponse509, false);
                 } else
@@ -1613,7 +1613,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeCustomerGatewaysResponse511 =
 
-                    skel.describeCustomerGateways(wrappedParam);
+                        skel.describeCustomerGateways(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeCustomerGatewaysResponse511, false);
                 } else
@@ -1627,7 +1627,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteNetworkAclResponse513 =
 
-                    skel.deleteNetworkAcl(wrappedParam);
+                        skel.deleteNetworkAcl(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteNetworkAclResponse513, false);
                 } else
@@ -1641,7 +1641,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteRouteResponse515 =
 
-                    skel.deleteRoute(wrappedParam);
+                        skel.deleteRoute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteRouteResponse515, false);
                 } else
@@ -1655,7 +1655,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     rebootInstancesResponse517 =
 
-                    skel.rebootInstances(wrappedParam);
+                        skel.rebootInstances(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), rebootInstancesResponse517, false);
                 } else
@@ -1669,7 +1669,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     modifyInstanceAttributeResponse519 =
 
-                    skel.modifyInstanceAttribute(wrappedParam);
+                        skel.modifyInstanceAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), modifyInstanceAttributeResponse519, false);
                 } else
@@ -1683,7 +1683,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     terminateInstancesResponse521 =
 
-                    skel.terminateInstances(wrappedParam);
+                        skel.terminateInstances(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), terminateInstancesResponse521, false);
                 } else
@@ -1697,7 +1697,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createVpnConnectionRouteResponse523 =
 
-                    skel.createVpnConnectionRoute(wrappedParam);
+                        skel.createVpnConnectionRoute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createVpnConnectionRouteResponse523, false);
                 } else
@@ -1711,7 +1711,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeConversionTasksResponse525 =
 
-                    skel.describeConversionTasks(wrappedParam);
+                        skel.describeConversionTasks(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeConversionTasksResponse525, false);
                 } else
@@ -1725,7 +1725,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeAddressesResponse527 =
 
-                    skel.describeAddresses(wrappedParam);
+                        skel.describeAddresses(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeAddressesResponse527, false);
                 } else
@@ -1739,7 +1739,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeInstanceAttributeResponse529 =
 
-                    skel.describeInstanceAttribute(wrappedParam);
+                        skel.describeInstanceAttribute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeInstanceAttributeResponse529, false);
                 } else
@@ -1753,7 +1753,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     attachInternetGatewayResponse531 =
 
-                    skel.attachInternetGateway(wrappedParam);
+                        skel.attachInternetGateway(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), attachInternetGatewayResponse531, false);
                 } else
@@ -1767,7 +1767,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createVpcResponse533 =
 
-                    skel.createVpc(wrappedParam);
+                        skel.createVpc(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createVpcResponse533, false);
                 } else
@@ -1781,7 +1781,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     replaceRouteTableAssociationResponse535 =
 
-                    skel.replaceRouteTableAssociation(wrappedParam);
+                        skel.replaceRouteTableAssociation(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), replaceRouteTableAssociationResponse535, false);
                 } else
@@ -1795,7 +1795,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     associateRouteTableResponse537 =
 
-                    skel.associateRouteTable(wrappedParam);
+                        skel.associateRouteTable(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), associateRouteTableResponse537, false);
                 } else
@@ -1809,7 +1809,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     detachInternetGatewayResponse539 =
 
-                    skel.detachInternetGateway(wrappedParam);
+                        skel.detachInternetGateway(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), detachInternetGatewayResponse539, false);
                 } else
@@ -1823,7 +1823,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     purchaseReservedInstancesOfferingResponse541 =
 
-                    skel.purchaseReservedInstancesOffering(wrappedParam);
+                        skel.purchaseReservedInstancesOffering(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), purchaseReservedInstancesOfferingResponse541, false);
                 } else
@@ -1837,7 +1837,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     importVolumeResponse543 =
 
-                    skel.importVolume(wrappedParam);
+                        skel.importVolume(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), importVolumeResponse543, false);
                 } else
@@ -1851,7 +1851,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeExportTasksResponse545 =
 
-                    skel.describeExportTasks(wrappedParam);
+                        skel.describeExportTasks(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeExportTasksResponse545, false);
                 } else
@@ -1865,7 +1865,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createInstanceExportTaskResponse547 =
 
-                    skel.createInstanceExportTask(wrappedParam);
+                        skel.createInstanceExportTask(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createInstanceExportTaskResponse547, false);
                 } else
@@ -1879,7 +1879,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     assignPrivateIpAddressesResponse549 =
 
-                    skel.assignPrivateIpAddresses(wrappedParam);
+                        skel.assignPrivateIpAddresses(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), assignPrivateIpAddressesResponse549, false);
                 } else
@@ -1893,7 +1893,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     reportInstanceStatusResponse551 =
 
-                    skel.reportInstanceStatus(wrappedParam);
+                        skel.reportInstanceStatus(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), reportInstanceStatusResponse551, false);
                 } else
@@ -1907,7 +1907,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeReservedInstancesOfferingsResponse553 =
 
-                    skel.describeReservedInstancesOfferings(wrappedParam);
+                        skel.describeReservedInstancesOfferings(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeReservedInstancesOfferingsResponse553, false);
                 } else
@@ -1921,7 +1921,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteVpnConnectionResponse555 =
 
-                    skel.deleteVpnConnection(wrappedParam);
+                        skel.deleteVpnConnection(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpnConnectionResponse555, false);
                 } else
@@ -1935,7 +1935,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteInternetGatewayResponse557 =
 
-                    skel.deleteInternetGateway(wrappedParam);
+                        skel.deleteInternetGateway(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteInternetGatewayResponse557, false);
                 } else
@@ -1949,7 +1949,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     deleteSpotDatafeedSubscriptionResponse559 =
 
-                    skel.deleteSpotDatafeedSubscription(wrappedParam);
+                        skel.deleteSpotDatafeedSubscription(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), deleteSpotDatafeedSubscriptionResponse559, false);
                 } else
@@ -1963,7 +1963,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     attachNetworkInterfaceResponse561 =
 
-                    skel.attachNetworkInterface(wrappedParam);
+                        skel.attachNetworkInterface(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), attachNetworkInterfaceResponse561, false);
                 } else
@@ -1977,7 +1977,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     createNetworkInterfaceResponse563 =
 
-                    skel.createNetworkInterface(wrappedParam);
+                        skel.createNetworkInterface(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), createNetworkInterfaceResponse563, false);
                 } else
@@ -1991,7 +1991,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     revokeSecurityGroupEgressResponse565 =
 
-                    skel.revokeSecurityGroupEgress(wrappedParam);
+                        skel.revokeSecurityGroupEgress(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), revokeSecurityGroupEgressResponse565, false);
                 } else
@@ -2005,7 +2005,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     monitorInstancesResponse567 =
 
-                    skel.monitorInstances(wrappedParam);
+                        skel.monitorInstances(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), monitorInstancesResponse567, false);
                 } else
@@ -2019,7 +2019,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     replaceRouteResponse569 =
 
-                    skel.replaceRoute(wrappedParam);
+                        skel.replaceRoute(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), replaceRouteResponse569, false);
                 } else
@@ -2033,7 +2033,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     attachVolumeResponse571 =
 
-                    skel.attachVolume(wrappedParam);
+                        skel.attachVolume(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), attachVolumeResponse571, false);
                 } else
@@ -2047,7 +2047,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     getConsoleOutputResponse573 =
 
-                    skel.getConsoleOutput(wrappedParam);
+                        skel.getConsoleOutput(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), getConsoleOutputResponse573, false);
                 } else
@@ -2061,7 +2061,7 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
 
                     describeRegionsResponse575 =
 
-                    skel.describeRegions(wrappedParam);
+                        skel.describeRegions(wrappedParam);
 
                     envelope = toEnvelope(getSOAPFactory(msgContext), describeRegionsResponse575, false);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/awsapi/src/com/amazon/ec2/UserDataType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UserDataType.java b/awsapi/src/com/amazon/ec2/UserDataType.java
index 4b04afd..2f84fbe 100644
--- a/awsapi/src/com/amazon/ec2/UserDataType.java
+++ b/awsapi/src/com/amazon/ec2/UserDataType.java
@@ -482,7 +482,7 @@ public class UserDataType implements org.apache.axis2.databinding.ADBBean {
                 // handle attribute "version"
                 java.lang.String tempAttribVersion =
 
-                reader.getAttributeValue(null, "version");
+                    reader.getAttributeValue(null, "version");
 
                 if (tempAttribVersion != null) {
                     java.lang.String content = tempAttribVersion;
@@ -499,7 +499,7 @@ public class UserDataType implements org.apache.axis2.databinding.ADBBean {
                 // handle attribute "encoding"
                 java.lang.String tempAttribEncoding =
 
-                reader.getAttributeValue(null, "encoding");
+                    reader.getAttributeValue(null, "encoding");
 
                 if (tempAttribEncoding != null) {
                     java.lang.String content = tempAttribEncoding;