You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mi...@apache.org on 2008/10/18 02:19:00 UTC

svn commit: r705805 - /ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java

Author: midon
Date: Fri Oct 17 17:19:00 2008
New Revision: 705805

URL: http://svn.apache.org/viewvc?rev=705805&view=rev
Log:
ODE-388: create a private class

Modified:
    ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java

Modified: ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java?rev=705805&r1=705804&r2=705805&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java Fri Oct 17 17:19:00 2008
@@ -144,7 +144,7 @@
 
             // provide HTTP credentials if any
             AuthenticationHelper.setHttpAuthentication(odeMex, operationOptions);
-            
+
             operationOptions.setAction(mctx.getSoapAction());
             operationOptions.setTo(axisEPR);
 
@@ -223,26 +223,7 @@
 
         WatchDog<Map, OptionsObserver> optionsWatchDog = _cachedOptions.get();
         if (optionsWatchDog == null) {
-            optionsWatchDog = new WatchDog<Map, OptionsObserver>(new WatchDog.Mutable<Map>() {
-                // ProcessConf#getProperties(String...) cannot return ull (by contract)
-                public boolean exists() {
-                    return true;
-                }
-
-                public boolean hasChangedSince(Map since) {
-                    Map latest = lastModified();  // cannot be null but better be prepared
-                    // check if mappings are equal
-                    return !CollectionUtils.equals(latest, since);
-                }
-
-                public Map lastModified() {
-                    return _pconf.getEndpointProperties(endpointReference);
-                }
-
-                public String toString() {
-                    return "Properties for Endpoint: "+endpointReference;
-                }
-            }, new OptionsObserver());
+            optionsWatchDog = new WatchDog<Map, OptionsObserver>(new EndpointPropertiesMutable(), new OptionsObserver());
             _cachedOptions.set(optionsWatchDog);
         }
         optionsWatchDog.check();
@@ -265,8 +246,10 @@
                     options.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policyDoc);
 
                     // make sure the proper modules are engaged
-                    if (!serviceClient.getAxisConfiguration().isEngaged("rampart")) serviceClient.engageModule("rampart");
-                    if (!serviceClient.getAxisConfiguration().isEngaged("addressing")) serviceClient.engageModule("addressing");
+                    if (!serviceClient.getAxisConfiguration().isEngaged("rampart"))
+                        serviceClient.engageModule("rampart");
+                    if (!serviceClient.getAxisConfiguration().isEngaged("addressing"))
+                        serviceClient.engageModule("addressing");
                 } finally {
                     policyStream.close();
                 }
@@ -474,7 +457,6 @@
 
         Options options;
 
-
         public boolean isInitialized() {
             return options != null;
         }
@@ -490,7 +472,7 @@
             options.setTimeOutInMilliSeconds(60000);
         }
 
-        public void doOnUpdate() {
+        public void onUpdate() {
             init();
 
             // note: don't make this map an instance attribute, so we always get the latest version
@@ -499,4 +481,25 @@
         }
     }
 
+    private class EndpointPropertiesMutable implements WatchDog.Mutable<Map> {
+        // ProcessConf#getProperties(String...) cannot return null (by contract)
+        public boolean exists() {
+            return true;
+        }
+
+        public boolean hasChangedSince(Map since) {
+            Map latest = lastModified();  // cannot be null but better be prepared
+            // check if mappings are equal
+            return !CollectionUtils.equals(latest, since);
+        }
+
+        public Map lastModified() {
+            return _pconf.getEndpointProperties(endpointReference);
+        }
+
+        public String toString() {
+            return "Properties for Endpoint: " + endpointReference;
+        }
+    }
+
 }