svn commit: r602788 - /webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java

[ruwan]

Author: ruwan
Date: Sun Dec  9 22:31:51 2007
New Revision: 602788

URL: http://svn.apache.org/viewvc?rev=602788&view=rev
Log:
code reformat, and inappropriate trace fix

Modified:
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?rev=602788&r1=602787&r2=602788&view=diff
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
 Sun Dec  9 22:31:51 2007
@@ -237,7 +237,8 @@
 
                 try {
                     // detect version of the WSDL 1.1 or 2.0
-                    if (trace()) trace.info("WSDL Namespace is : " + 
wsdlNamespace.getNamespaceURI());
+                    if (trace()) trace.info("WSDL Namespace is : "
+                        + wsdlNamespace.getNamespaceURI());
 
                     if (wsdlNamespace != null) {
                         boolean isWSDL11 = false;
@@ -247,7 +248,8 @@
                                 equals(wsdlNamespace.getNamespaceURI())) {
                             wsdlToAxisServiceBuilder =
                                     new 
WSDL20ToAxisServiceBuilder(wsdlInputStream, null, null);
-                            wsdlToAxisServiceBuilder.setBaseUri(wsdlURI != 
null ? wsdlURI.toString() : "");
+                            wsdlToAxisServiceBuilder.setBaseUri(
+                                wsdlURI != null ? wsdlURI.toString() : "");
 
                         } else if 
(org.apache.axis2.namespace.Constants.NS_URI_WSDL11.
                                 equals(wsdlNamespace.getNamespaceURI())) {
@@ -292,7 +294,8 @@
                                     AxisBindingOperation axisBindingOperation =
                                         (AxisBindingOperation) children.next();
                                     axisBindingOperation.setProperty(
-                                        
WSDL2Constants.ATTR_WHTTP_IGNORE_UNCITED, new Boolean(false));
+                                        
WSDL2Constants.ATTR_WHTTP_IGNORE_UNCITED,
+                                        new Boolean(false));
                                 }
                             }
                         }
@@ -337,7 +340,9 @@
         }
 
         // process parameters
-        if (trace()) trace.info("Setting service parameters : " + parameters);
+        if (trace() && parameters.size() > 0) {
+            trace.info("Setting service parameters : " + parameters);
+        }
         Iterator iter = parameters.keySet().iterator();
         while (iter.hasNext()) {
             String name = (String) iter.next();
@@ -355,10 +360,12 @@
             }
         }
 
-        if (trace()) trace.info("Setting service level policies : " + 
serviceLevelPolicies);
         // if service level policies are specified, apply them
-
         if (!serviceLevelPolicies.isEmpty()) {
+
+            if (trace()) {
+                trace.info("Setting service level policies : " + 
serviceLevelPolicies);
+            }
             Policy svcEffectivePolicy = null;
             iter = serviceLevelPolicies.iterator();
 
@@ -371,8 +378,9 @@
                         svcEffectivePolicy = PolicyEngine.getPolicy(
                             
SynapseConfigUtils.getStreamSource(policyProp).getInputStream());
                     } else {
-                        svcEffectivePolicy = (Policy) svcEffectivePolicy.merge(
-                            
PolicyEngine.getPolicy(SynapseConfigUtils.getStreamSource(policyProp).getInputStream()));
+                        svcEffectivePolicy = svcEffectivePolicy.merge(
+                            
PolicyEngine.getPolicy(SynapseConfigUtils.getStreamSource(
+                                policyProp).getInputStream()));
                     }
                 }
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]