svn commit: r788302 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: config/xml/eventing/EventSourceFactory.java eventing/managers/DefaultInMemorySubscriptionManager.java

[asanka]

Author: asanka
Date: Thu Jun 25 09:21:50 2009
New Revision: 788302

URL: http://svn.apache.org/viewvc?rev=788302&view=rev
Log:
Fixing the static subscriptions. 

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventSourceFactory.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventSourceFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventSourceFactory.java?rev=788302&r1=788301&r2=788302&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventSourceFactory.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventSourceFactory.java
 Thu Jun 25 09:21:50 2009
@@ -162,7 +162,7 @@
                     OMAttribute sourceAttr = 
elmFilter.getAttribute(FILTER_SOURCE_QNAME);
                     if (sourceAttr != null) {
                         
synapseSubscription.setFilterDialect(dialectAttr.getAttributeValue());
-                        
synapseSubscription.setFilterValue(elmFilter.getText());
+                        
synapseSubscription.setFilterValue(sourceAttr.getAttributeValue());
                     } else {
                         handleException(
                                 "Error in creating static subscription. Filter 
source not defined");
@@ -206,9 +206,9 @@
             } else {
                 synapseSubscription.setExpires(null);
             }
-            synapseSubscription.getSubscriptionData()
-                    .setProperty(SynapseEventingConstants.STATIC_ENTRY, 
"true");
-                
synapseEventSource.getSubscriptionManager().subscribe(synapseSubscription);
+
+            synapseSubscription.setStaticEntry(true);
+            
synapseEventSource.getSubscriptionManager().subscribe(synapseSubscription);
         }
     }
 }

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java?rev=788302&r1=788301&r2=788302&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java
 Thu Jun 25 09:21:50 2009
@@ -51,11 +51,9 @@
 
     public List<Subscription> getStaticSubscriptions() {
         LinkedList<Subscription> list = new LinkedList<Subscription>();
-        for (Subscription stringSubscription : store.values()) {
-            SubscriptionData data = stringSubscription.getSubscriptionData();
-            if (data != null && "true".equals(data.getProperty(
-                    SynapseEventingConstants.STATIC_ENTRY))) {
-                list.add(stringSubscription);
+        for (Subscription storeSubscription : store.values()) {
+            if (storeSubscription.isStaticEntry()) {
+                list.add(storeSubscription);
             }
         }
         return list;