You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by th...@apache.org on 2012/03/08 09:22:25 UTC
svn commit: r1298294 - in
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2:
description/AxisService2WSDL11.java util/WSDLSerializationUtil.java
Author: thilinamb
Date: Thu Mar 8 08:22:25 2012
New Revision: 1298294
URL: http://svn.apache.org/viewvc?rev=1298294&view=rev
Log:
Fixing an issue when defining policy references in services.xml.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?rev=1298294&r1=1298293&r2=1298294&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java Thu Mar 8 08:22:25 2012
@@ -1262,10 +1262,10 @@ public class AxisService2WSDL11 implemen
PolicyLocator locator = new PolicyLocator(axisService);
Policy p = locator.lookup(key);
- if (p == null) {
- throw new Exception("Policy not found for uri : " + key);
+ if (p != null) {
+ addPolicyToDefinitionElement(key, p);
+
}
- addPolicyToDefinitionElement(key, p);
}
}
}
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java?rev=1298294&r1=1298293&r2=1298294&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java Thu Mar 8 08:22:25 2012
@@ -19,26 +19,13 @@
package org.apache.axis2.util;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.description.AxisDescription;
-import org.apache.axis2.description.AxisMessage;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.PolicySubject;
-import org.apache.axis2.description.WSDL2Constants;
+import org.apache.axis2.description.*;
import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.namespace.Constants;
@@ -48,6 +35,9 @@ import org.apache.axis2.wsdl.SOAPModuleM
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyReference;
+import javax.xml.namespace.QName;
+import java.util.*;
+
/**
* Helps the AxisService to WSDL process
*/
@@ -522,11 +512,9 @@ public class WSDLSerializationUtil {
PolicyLocator locator = new PolicyLocator(service);
Policy p = locator.lookup(key);
- if (p == null) {
- throw new RuntimeException("Policy not found for uri : "
- + key);
- }
- policies.add(p);
+ if (p != null) {
+ policies.add(p);
+ }
}
}