qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject svn commit: r561974 - in /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms: MessageActor.java MessageConsumerImpl.java MessageListenerWrapper.java QpidExceptionListenerImpl.java SessionImpl.java
Date Wed, 01 Aug 2007 22:19:47 GMT
Author: rajith
Date: Wed Aug  1 15:19:43 2007
New Revision: 561974

URL: http://svn.apache.org/viewvc?view=rev&rev=561974
Log:
made modifications to correct compilation errors due to API changes, Arnaud u need to look
at them and make proper corrections

Modified:
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageActor.java
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageListenerWrapper.java
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/QpidExceptionListenerImpl.java
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/SessionImpl.java

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageActor.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageActor.java?view=diff&rev=561974&r1=561973&r2=561974
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageActor.java
(original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageActor.java
Wed Aug  1 15:19:43 2007
@@ -19,7 +19,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.qpid.nclient.api.Resource;
 import org.apache.qpidity.QpidException;
 
 import javax.jms.IllegalStateException;
@@ -46,11 +45,6 @@
     SessionImpl _session;
 
     /**
-     * The underlying Qpid Resource
-     */
-    Resource _qpidResource;
-
-    /**
      * The JMS destination this actor is set for.
      */
     DestinationImpl _destination;
@@ -120,14 +114,20 @@
         if (!_isClosed)
         {
             // close the underlying qpid resource
-            try
+           /* try
             {
-                _qpidResource.close();
+            	// Arnaud I can't see where this var is initialized
+            	// I assume it's the session
+                //_qpidResource.close();
+            	
+            	
             }
             catch (QpidException e)
             {
                 throw ExceptionHelper.convertQpidExceptionToJMSException(e);
-            }
+            }*/
+        	
+        	_session.close(); //is this correct ?
             _isClosed = true;
         }
     }

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java?view=diff&rev=561974&r1=561973&r2=561974
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java
(original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java
Wed Aug  1 15:19:43 2007
@@ -76,7 +76,7 @@
         _messageSelector = messageSelector;
         _noLocal = noLocal;
         _subscriptionName = subscriptionName;
-        try
+        /*try
         {
             // TODO define the relevant options 
             _qpidReceiver = _session.getQpidSession().createReceiver(destination.getName(),
null);
@@ -84,7 +84,7 @@
         catch (QpidException e)
         {
             throw ExceptionHelper.convertQpidExceptionToJMSException(e);
-        }
+        }*/
     }
     //----- Message consumer API
 

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageListenerWrapper.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageListenerWrapper.java?view=diff&rev=561974&r1=561973&r2=561974
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageListenerWrapper.java
(original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageListenerWrapper.java
Wed Aug  1 15:19:43 2007
@@ -18,9 +18,9 @@
 package org.apache.qpid.nclient.jms;
 
 import org.apache.qpid.nclient.api.MessageListener;
-import org.apache.qpid.nclient.api.Message;
 import org.apache.qpid.nclient.jms.message.AbstractJMSMessage;
 import org.apache.qpid.nclient.jms.message.QpidMessage;
+import org.apache.qpidity.api.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -78,12 +78,12 @@
                 _consumer.getSession().acknowledgeMessage(jmsMessage);
             }
             // The JMS specs says:
-            /* The result of a listener throwing a RuntimeException depends on the session’s
+            /* The result of a listener throwing a RuntimeException depends on the session�s
             * acknowledgment mode.
-            • --- AUTO_ACKNOWLEDGE or DUPS_OK_ACKNOWLEDGE - the message
+            � --- AUTO_ACKNOWLEDGE or DUPS_OK_ACKNOWLEDGE - the message
             * will be immediately redelivered. The number of times a JMS provider will
             * redeliver the same message before giving up is provider-dependent.
-            • --- CLIENT_ACKNOWLEDGE - the next message for the listener is delivered.
+            � --- CLIENT_ACKNOWLEDGE - the next message for the listener is delivered.
             * --- Transacted Session - the next message for the listener is delivered.
             *
             * The number of time we try redelivering the message is 0
@@ -99,7 +99,7 @@
             // If the session has been recovered we then need to redelivered this message
             if (_consumer.getSession().isInRecovery())
             {
-                message.release();
+                //message.release();
             }
             // Tell the jms Session to ack this message if required
             else if (!_consumer.getSession().getTransacted())

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/QpidExceptionListenerImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/QpidExceptionListenerImpl.java?view=diff&rev=561974&r1=561973&r2=561974
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/QpidExceptionListenerImpl.java
(original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/QpidExceptionListenerImpl.java
Wed Aug  1 15:19:43 2007
@@ -17,7 +17,6 @@
  */
 package org.apache.qpid.nclient.jms;
 
-import org.apache.qpid.nclient.api.ExceptionListener;
 import org.apache.qpidity.QpidException;
 
 import javax.jms.JMSException;
@@ -25,7 +24,7 @@
 /**
  * An exception listner 
  */
-public class QpidExceptionListenerImpl implements ExceptionListener
+public class QpidExceptionListenerImpl //implements ExceptionListener
 {
     private javax.jms.ExceptionListener _jmsExceptionListener;
 

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/SessionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/SessionImpl.java?view=diff&rev=561974&r1=561973&r2=561974
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/SessionImpl.java
(original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/SessionImpl.java
Wed Aug  1 15:19:43 2007
@@ -112,7 +112,7 @@
             // set transacted if required
             if (_transacted)
             {
-                _qpidSession.setTransacted();
+                //_qpidSession.setTransacted();
             }
         }
         catch (QpidException e)



Mime
View raw message