You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by as...@apache.org on 2010/03/17 04:57:15 UTC
svn commit: r924144 -
/synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java
Author: asanka
Date: Wed Mar 17 03:57:15 2010
New Revision: 924144
URL: http://svn.apache.org/viewvc?rev=924144&view=rev
Log:
Applying the revision:924143 from trunk
Modified:
synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java
Modified: synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java
URL: http://svn.apache.org/viewvc/synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java?rev=924144&r1=924143&r2=924144&view=diff
==============================================================================
--- synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java (original)
+++ synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java Wed Mar 17 03:57:15 2010
@@ -263,26 +263,30 @@ public class SubscriptionMessageBuilder
if (renewElem != null) {
OMElement expiryElem = renewElem.getFirstChildWithName(EXPIRES);
if (expiryElem != null) {
- Calendar calendarExpires = null;
- try {
- if (expiryElem.getText().startsWith("P")) {
- calendarExpires = ConverterUtil.convertToDuration(expiryElem.getText())
- .getAsCalendar();
+ if (!(expiryElem.getText().startsWith("*"))) {
+ Calendar calendarExpires = null;
+ try {
+ if (expiryElem.getText().startsWith("P")) {
+ calendarExpires = ConverterUtil.convertToDuration(expiryElem.getText())
+ .getAsCalendar();
+ } else {
+ calendarExpires = ConverterUtil.convertToDateTime(expiryElem.getText());
+ }
+ } catch (Exception e) {
+ setExpirationFault(subscription);
+ }
+ Calendar calendarNow = Calendar.getInstance();
+ if ((isValidDate(expiryElem.getText(), calendarExpires)) &&
+ (calendarNow.before(calendarExpires))) {
+ subscription.setExpires(calendarExpires);
} else {
- calendarExpires = ConverterUtil.convertToDateTime(expiryElem.getText());
+ setExpirationFault(subscription);
}
- } catch (Exception e) {
- setExpirationFault(subscription);
- }
- Calendar calendarNow = Calendar.getInstance();
- if ((isValidDate(expiryElem.getText(), calendarExpires)) &&
- (calendarNow.before(calendarExpires))) {
+
subscription.setExpires(calendarExpires);
} else {
setExpirationFault(subscription);
}
-
- subscription.setExpires(calendarExpires);
} else {
setExpirationFault(subscription);
}