svn commit: r924143 - /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java

[asanka]

Author: asanka
Date: Wed Mar 17 03:56:07 2010
New Revision: 924143

URL: http://svn.apache.org/viewvc?rev=924143&view=rev
Log:
Fixing the null pointer exception throw for the invalid renew request.

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java?rev=924143&r1=924142&r2=924143&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java
 Wed Mar 17 03:56:07 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);
             }