[Carbon-commits] [Carbon Components] svn commit r47423 - in trunk/carbon-components/mediators/aggregate: org.wso2.carbon.mediator.aggregate.ui/src/main/resources/web/aggregate-mediator org.wso2.carbon.mediator.aggregate/src/main/java/org/wso2/carbon/mediator/aggregate

[miyuru at wso2.com]

Author: miyuru
Date: Mon Oct 19 04:06:55 2009
New Revision: 47423
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=47423

Log:
fixed https://wso2.org/jira/browse/CARBON-4955


Modified:
   trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate.ui/src/main/resources/web/aggregate-mediator/edit-mediator.jsp
   trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate.ui/src/main/resources/web/aggregate-mediator/update-mediator.jsp
   trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate/src/main/java/org/wso2/carbon/mediator/aggregate/AggregateMediator.java

Modified: trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate.ui/src/main/resources/web/aggregate-mediator/edit-mediator.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate.ui/src/main/resources/web/aggregate-mediator/edit-mediator.jsp?rev=47423&r1=47422&r2=47423&view=diff
==============================================================================
--- trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate.ui/src/main/resources/web/aggregate-mediator/edit-mediator.jsp	(original)
+++ trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate.ui/src/main/resources/web/aggregate-mediator/edit-mediator.jsp	Mon Oct 19 04:06:55 2009
@@ -85,13 +85,13 @@
                     </td>
                     <td>
                         <%
-                            if (aggregateMediator.getCompletionTimeoutMillis() == 0) {
+                            if (aggregateMediator.getCompletionTimeoutSec() == 0) {
                         %>
                         <input value="" name="complete_time" id="complete_time" type="text">
                         <%
                         } else {
                         %>
-                        <input value="<%=aggregateMediator.getCompletionTimeoutMillis()%>"
+                        <input value="<%=aggregateMediator.getCompletionTimeoutSec()%>"
                                name="complete_time" id="complete_time" type="text">
                         <%
                             }

Modified: trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate.ui/src/main/resources/web/aggregate-mediator/update-mediator.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate.ui/src/main/resources/web/aggregate-mediator/update-mediator.jsp?rev=47423&r1=47422&r2=47423&view=diff
==============================================================================
--- trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate.ui/src/main/resources/web/aggregate-mediator/update-mediator.jsp	(original)
+++ trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate.ui/src/main/resources/web/aggregate-mediator/update-mediator.jsp	Mon Oct 19 04:06:55 2009
@@ -36,9 +36,13 @@
     AggregateMediator aggregateMediator = (AggregateMediator) mediator;
     if(!complete_max.equals("")){
         aggregateMediator.setMaxMessagesToComplete(Integer.parseInt(complete_max));
+    } else {
+        aggregateMediator.setMaxMessagesToComplete(-1);
     }
     if(!complete_min.equals("")){
         aggregateMediator.setMinMessagesToComplete(Integer.parseInt(complete_min));
+    } else {
+        aggregateMediator.setMinMessagesToComplete(-1);
     }
     if ("selectFromRegistry".equals(sequenceOption)) {
         String selectFromRegistry = request.getParameter("mediator.sequence_hidden");
@@ -52,7 +56,9 @@
     }
     if(!complete_time.equals("")){
         long value = Long.parseLong(complete_time);
-        aggregateMediator.setCompletionTimeoutMillis(value);        
+        aggregateMediator.setCompletionTimeoutSec(value);
+    } else {
+        aggregateMediator.setCompletionTimeoutSec(0);
     }
 
      XPathFactory xPathFactory = XPathFactory.getInstance();
@@ -61,6 +67,8 @@
       }
       if(!correlate_exp.equals("")){
             aggregateMediator.setCorrelateExpression(xPathFactory.createSynapseXPath("correlate_expr", request, session));
+      } else {
+            aggregateMediator.setCorrelateExpression(null);
       }
 
 %>

Modified: trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate/src/main/java/org/wso2/carbon/mediator/aggregate/AggregateMediator.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate/src/main/java/org/wso2/carbon/mediator/aggregate/AggregateMediator.java?rev=47423&r1=47422&r2=47423&view=diff
==============================================================================
--- trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate/src/main/java/org/wso2/carbon/mediator/aggregate/AggregateMediator.java	(original)
+++ trunk/carbon-components/mediators/aggregate/org.wso2.carbon.mediator.aggregate/src/main/java/org/wso2/carbon/mediator/aggregate/AggregateMediator.java	Mon Oct 19 04:06:55 2009
@@ -51,7 +51,7 @@
             = new QName(XMLConfigConstants.NULL_NAMESPACE, "sequence");
 
 
-    private long completionTimeoutMillis = 0;
+    private long completionTimeoutSec = 0;
     private int minMessagesToComplete = -1;
     private int maxMessagesToComplete = -1;
 
@@ -68,12 +68,12 @@
         this.minMessagesToComplete = minMessagesToComplete;
     }
 
-    public long getCompletionTimeoutMillis() {
-        return completionTimeoutMillis;
+    public long getCompletionTimeoutSec() {
+        return completionTimeoutSec;
     }
 
-    public void setCompletionTimeoutMillis(long completionTimeoutMillis) {
-        this.completionTimeoutMillis = completionTimeoutMillis;
+    public void setCompletionTimeoutSec(long completionTimeoutSec) {
+        this.completionTimeoutSec = completionTimeoutSec;
     }
 
     public int getMaxMessagesToComplete() {
@@ -125,9 +125,9 @@
         }
 
         OMElement completeCond = fac.createOMElement("completeCondition", synNS);
-        if (completionTimeoutMillis != 0) {
+        if (completionTimeoutSec != 0) {
             completeCond.addAttribute("timeout",
-                    Long.toString(completionTimeoutMillis / 1000), nullNS);
+                    Long.toString(completionTimeoutSec), nullNS);
         }
         OMElement messageCount = fac.createOMElement("messageCount", synNS);
         if (minMessagesToComplete != 0) {
@@ -178,8 +178,8 @@
         if (completeCond != null) {
             OMAttribute completeTimeout = completeCond.getAttribute(TIMEOUT_Q);
             if (completeTimeout != null) {
-                completionTimeoutMillis =
-                        Long.parseLong(completeTimeout.getAttributeValue()) * 1000;
+                completionTimeoutSec =
+                        Long.parseLong(completeTimeout.getAttributeValue());
             }
 
             OMElement messageCount = completeCond.getFirstChildWithName(MESSAGE_COUNT_Q);