From 3ec5ee10947c7eebd7ac360a287cbb362e781dc9 Mon Sep 17 00:00:00 2001
From: Arnaud Simon <arnaudsimon@apache.org>
Date: Wed, 17 Oct 2007 12:35:17 +0000
Subject: Updated message selector

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@585457 13f79535-47bb-0310-9956-ffa450edef68
---
 java/client/pom.xml                                   | 19 +++++++++++++++++++
 .../apache/qpid/client/BasicMessageConsumer_0_10.java | 10 +++-------
 .../org/apache/qpidity/njms/MessageConsumerImpl.java  |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'java/client')

diff --git a/java/client/pom.xml b/java/client/pom.xml
index bd869d96ca..b58ab9fe3a 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -123,6 +123,25 @@
 
     <build>
         <plugins>
+	
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>javacc-maven-plugin</artifactId>
+                <version>2.0</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
+                            <outputDirectory>${basedir}/target/generated-sources</outputDirectory>
+                            <packageName>org.apache.qpidity.filter.selector</packageName>
+                        </configuration>
+                        <goals>
+                            <goal>javacc</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
            <plugin>
                 <artifactId>minijar-maven-plugin</artifactId>
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
index af259080a3..58b84910d4 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
@@ -98,7 +98,7 @@ public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], By
             {
                 _preAcquire = false;
             }
-        }
+        }                
     }
 
     // ----- Interface org.apache.qpidity.client.util.MessageListener
@@ -245,7 +245,7 @@ public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], By
         {
             if (getMessageSelector() != null)
             {
-                messageOk = _filter.matches((javax.jms.Message) message);
+                messageOk = _filter.matches(message);
             }
         }
         catch (Exception e)
@@ -253,11 +253,7 @@ public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], By
             throw new AMQException(AMQConstant.INTERNAL_ERROR, "Error when evaluating message selector", e);
         }
 
-        System.out.println("---------------------------------------------------------");
-        System.out.println("messageOk : " + messageOk + " pre-acquire mode : " + _preAcquire);
-        System.out.println("---------------------------------------------------------");
-
-        if (_logger.isDebugEnabled())
+       if (_logger.isDebugEnabled())
         {
             _logger.debug("messageOk " + messageOk);
             _logger.debug("_preAcquire " + _preAcquire);
diff --git a/java/client/src/main/java/org/apache/qpidity/njms/MessageConsumerImpl.java b/java/client/src/main/java/org/apache/qpidity/njms/MessageConsumerImpl.java
index 9baade610b..0b0b794135 100644
--- a/java/client/src/main/java/org/apache/qpidity/njms/MessageConsumerImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/njms/MessageConsumerImpl.java
@@ -570,7 +570,7 @@ public class MessageConsumerImpl extends MessageActor
         boolean messageOk = true;
         if (_messageSelector != null)
         {
-            messageOk = _filter.matches((Message) message);
+            messageOk = false; //_filter.matches(message);
         }
         if (_logger.isDebugEnabled())
         {
-- 
cgit v1.2.1