Author: asankaa Date: Thu Jun 25 02:23:18 2009 New Revision: 39899 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=39899
Log: Applying revision 788302 from the synapse trunk. Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventSourceFactory.java branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventSourceFactory.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventSourceFactory.java?rev=39899&r1=39898&r2=39899&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventSourceFactory.java (original) +++ branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventSourceFactory.java Thu Jun 25 02:23:18 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: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java?rev=39899&r1=39898&r2=39899&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java (original) +++ branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java Thu Jun 25 02:23:18 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; _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
