svn commit: r1177280 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java

[thilinamb]

Author: thilinamb
Date: Thu Sep 29 12:15:55 2011
New Revision: 1177280

URL: http://svn.apache.org/viewvc?rev=1177280&view=rev
Log:
Applying the patch provided by AmilaJ for RAMPART-334

Modified:
    axis/axis2/java/rampart/branches/1_6/   (props changed)
    
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java

Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 29 12:15:55 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279

Modified: 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?rev=1177280&r1=1177279&r2=1177280&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
 (original)
+++ 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
 Thu Sep 29 12:15:55 2011
@@ -281,6 +281,20 @@ public class RampartMessageData {
                 if (rampartConfigCallbackHandler != null) {
                     
rampartConfigCallbackHandler.update(policyData.getRampartConfig());
                 }
+
+                // Update TTL and max skew time
+                RampartConfig policyDataRampartConfig = 
policyData.getRampartConfig();
+                if (policyDataRampartConfig != null) {
+                    String timeToLiveString = 
policyDataRampartConfig.getTimestampTTL();
+                    if (timeToLiveString != null && 
!timeToLiveString.equals("")) {
+                        this.setTimeToLive(Integer.parseInt(timeToLiveString));
+                    }
+
+                    String maxSkewString = 
policyDataRampartConfig.getTimestampMaxSkew();
+                    if (maxSkewString != null && !maxSkewString.equals("")) {
+                        
this.setTimestampMaxSkew(Integer.parseInt(maxSkewString));
+                    }
+                }
                 
                 //Check for RST and RSTR for an SCT
                 String wsaAction = msgContext.getWSAAction();