svn commit: r713636 - /webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java

Author: amilas
Date: Wed Nov 12 20:36:32 2008
New Revision: 713636

URL: http://svn.apache.org/viewvc?rev=713636&view=rev
Log:
applied the patch for Sandesha2-181

Modified:
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java?rev=713636&r1=713635&r2=713636&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java Wed Nov 12 20:36:32 2008
@@ -108,7 +108,7 @@
         long timeOut = -1;
 
         if (measure == null) {
-            this.inactivityTimeoutInterval = value;
+            timeOut = value;
         } else if ("seconds".equals(measure)) {
             timeOut = value * 1000;
         } else if ("minutes".equals(measure)) {
@@ -127,7 +127,7 @@
     long timeOut = 0;
 
     if (measure == null) {
-        this.sequenceRemovalTimeoutInterval = value;
+        timeOut = value;
     } else if ("seconds".equals(measure)) {
         timeOut = value * 1000;
     } else if ("minutes".equals(measure)) {
@@ -255,8 +255,7 @@
 
 			String prefix = writer.getPrefix(namespaceURI);
 			if (prefix == null) {
-			    prefix = Sandesha2Constants.Assertions.Q_ELEM_RMASSERTION
-			            .getPrefix();
+			    prefix = Sandesha2Constants.Assertions.Q_ELEM_RMASSERTION.getPrefix();
 			    writer.setPrefix(prefix, namespaceURI);
 			}
 
@@ -304,28 +303,11 @@
 			writer.writeCharacters(Long.toString(getInactivityTimeoutInterval()));
 			writer.writeEndElement();
 			
-            
-            // FIXME : Assign default values if inactivityTimeoutMeasure is set to null
-            if (inactivityTimeoutMeasure != null && inactivityTimeoutMeasure.trim().length() > 0) {
-			// <wsrm:InactivityTimeoutMeasure />
-			writer.writeStartElement(prefix, Sandesha2Constants.Assertions.Q_ELEM_INACTIVITY_TIMEOUT_MEASURES.getLocalPart(), namespaceURI);
-			writer.writeCharacters(inactivityTimeoutMeasure);
-			writer.writeEndElement();
-            }
-
             // <wsrm:SequenceRemovalTimeout />
 			writer.writeStartElement(prefix, Sandesha2Constants.Assertions.Q_ELEM_SEQUENCE_REMOVAL_TIMEOUT.getLocalPart(), namespaceURI);
 			writer.writeCharacters(Long.toString(getSequenceRemovalTimeoutInterval()));
 			writer.writeEndElement();
 			
-			// <wsrm:SequenceRemovalTimeoutMeasure />
-            // FIXME : Assign default values if sequenceRemovalTimeoutMeasure is set to null
-            if (sequenceRemovalTimeoutMeasure != null && sequenceRemovalTimeoutMeasure.trim().length() > 0) {
-			writer.writeStartElement(prefix, Sandesha2Constants.Assertions.Q_ELEM_SEQUENCE_REMOVAL_TIMEOUT_MEASURES.getLocalPart(), namespaceURI);
-			writer.writeCharacters(sequenceRemovalTimeoutMeasure);
-			writer.writeEndElement();
-            }
-
 			// <wsrm:InvokeInOrder />
 			writer.writeStartElement(prefix, Sandesha2Constants.Assertions.Q_ELEM_INVOKE_INORDER.getLocalPart(), namespaceURI);
 			writer.writeCharacters(Boolean.toString(isInOrder()));