svn commit: r355947 - in /webservices/commons/trunk/policy/src/org/apache/ws/policy/util: DOMPolicyReader.java OMPolicyReader.java

[werner]

Author: werner
Date: Sun Dec 11 01:35:13 2005
New Revision: 355947

URL: http://svn.apache.org/viewcvs?rev=355947&view=rev
Log:
Fix detection of wsp:Optional flag in reader.

Modified:
    
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/DOMPolicyReader.java
    
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/OMPolicyReader.java

Modified: 
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/DOMPolicyReader.java
URL: 
http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/util/DOMPolicyReader.java?rev=355947&r1=355946&r2=355947&view=diff
==============================================================================
--- 
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/DOMPolicyReader.java
 (original)
+++ 
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/DOMPolicyReader.java
 Sun Dec 11 01:35:13 2005
@@ -141,10 +141,8 @@
         result.setAttributes(getAttributes(element));
         String isOptional = result.getAttribute(new QName(
                 PolicyConstants.WS_POLICY_NAMESPACE_URI, "Optional"));
-        if (isOptional != null && Boolean.getBoolean(isOptional)) {
-            result.setOptional(true);
-        }        
-                
+        result.setOptional(new Boolean(isOptional).booleanValue());
+                        
         //CHECK ME
                NodeList list = element.getChildNodes();
                int length = list.getLength();

Modified: 
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/OMPolicyReader.java
URL: 
http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/util/OMPolicyReader.java?rev=355947&r1=355946&r2=355947&view=diff
==============================================================================
--- 
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/OMPolicyReader.java
 (original)
+++ 
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/OMPolicyReader.java
 Sun Dec 11 01:35:13 2005
@@ -130,9 +130,7 @@
 
         String isOptional = result.getAttribute(new QName(
                 PolicyConstants.WS_POLICY_NAMESPACE_URI, "Optional"));
-        if (isOptional != null && Boolean.getBoolean(isOptional)) {
-            result.setOptional(true);
-        }
+        result.setOptional(new Boolean(isOptional).booleanValue());
 
         // setting the text value ..
         String strValue = element.getText();