added error code support

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@565561 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 28 insertions, 18 deletions

diff --git a/java/client/src/main/java/org/apache/qpidity/client/Client.java b/java/client/src/main/java/org/apache/qpidity/client/Client.java
index 8465475282..b440561b66 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/Client.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/Client.java
@@ -10,6 +10,7 @@ import org.apache.qpidity.Channel;
 import org.apache.qpidity.Connection;
 import org.apache.qpidity.ConnectionClose;
 import org.apache.qpidity.ConnectionDelegate;
+import org.apache.qpidity.ErrorCode;
 import org.apache.qpidity.MinaHandler;
 import org.apache.qpidity.QpidException;
 import org.apache.qpidity.SessionDelegate;
@@ -39,9 +40,13 @@ public class Client implements org.apache.qpidity.client.Connection
                 return new ClientSessionDelegate();
             }
             
-            @Override public void connectionClose(Channel context, ConnectionClose struct) 
+            @Override public void connectionClose(Channel context, ConnectionClose connectionClose) 
             {
-                _exceptionListner.onException(new QpidException("Server closed the connection: Reason " + struct.getReplyText(),struct.getReplyCode(),null));
+                _exceptionListner.onException(
+                        new QpidException("Server closed the connection: Reason " + 
+                                           connectionClose.getReplyText(),
+                                           ErrorCode.get(connectionClose.getReplyCode()),
+                                           null));
             }
         };
         
diff --git a/java/client/src/main/java/org/apache/qpidity/client/ClientSession.java b/java/client/src/main/java/org/apache/qpidity/client/ClientSession.java
index b5d8add9e2..13f3eeb1b6 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/ClientSession.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/ClientSession.java
@@ -3,6 +3,7 @@ package org.apache.qpidity.client;
 import java.io.EOFException;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -21,11 +22,9 @@ public class ClientSession extends org.apache.qpidity.Session implements org.apa
     private ExceptionListener _exceptionListner;
     private RangeSet _acquiredMessages;
     private RangeSet _rejectedMessages;
-    private Map<String,List<RangeSet>> _unackedMessages = new HashMap<String,List<RangeSet>>();
     
     @Override public void sessionClose()
     {
-        // release all unacked messages and then issues a close
         super.sessionClose();
     }
     
diff --git a/java/client/src/main/java/org/apache/qpidity/client/ClientSessionDelegate.java b/java/client/src/main/java/org/apache/qpidity/client/ClientSessionDelegate.java
index 975dcb6d8b..cd7b66111d 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/ClientSessionDelegate.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/ClientSessionDelegate.java
@@ -2,6 +2,7 @@ package org.apache.qpidity.client;
 
 import java.nio.ByteBuffer;
 
+import org.apache.qpidity.ErrorCode;
 import org.apache.qpidity.Frame;
 import org.apache.qpidity.MessageAcquired;
 import org.apache.qpidity.MessageReject;
@@ -10,6 +11,7 @@ import org.apache.qpidity.QpidException;
 import org.apache.qpidity.Range;
 import org.apache.qpidity.RangeSet;
 import org.apache.qpidity.Session;
+import org.apache.qpidity.SessionClosed;
 import org.apache.qpidity.SessionDelegate;
 import org.apache.qpidity.Struct;
 
@@ -19,6 +21,14 @@ public class ClientSessionDelegate extends SessionDelegate
     private MessageTransfer _currentTransfer;
     private MessagePartListener _currentMessageListener;
     
+    @Override public void sessionClosed(Session ssn,SessionClosed sessionClosed)
+    {
+        ((ClientSession)ssn).notifyException(new QpidException(sessionClosed.getReplyText(),ErrorCode.get(sessionClosed.getReplyCode()),null));
+    }
+    
+    //  --------------------------------------------
+    //   Message methods
+    // --------------------------------------------
     @Override public void data(Session ssn, Frame frame)
     {
         for (ByteBuffer b : frame)
@@ -52,10 +62,6 @@ public class ClientSessionDelegate extends SessionDelegate
         }
     }
     
-    //  --------------------------------------------
-    //   Message methods
-    // --------------------------------------------
-    
     
     @Override public void messageReject(Session session, MessageReject struct) 
     {
@@ -68,7 +74,7 @@ public class ClientSessionDelegate extends SessionDelegate
             }
         }
         ((ClientSession)session).setRejectedMessages(struct.getTransfers());
-        ((ClientSession)session).notifyException(new QpidException("Message Rejected",0,null));
+        ((ClientSession)session).notifyException(new QpidException("Message Rejected",ErrorCode.MESSAGE_REJECTED,null));
     }
     
     @Override public void messageAcquired(Session session, MessageAcquired struct) 
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/message/MessageImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/message/MessageImpl.java
index 1d1ee0582d..0285e60908 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/message/MessageImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/message/MessageImpl.java
@@ -864,7 +864,7 @@ public class MessageImpl extends QpidMessage implements Message
     {
         if (_destination == null)
         {
-            throw new QpidException("Invalid destination null", null, null);
+            throw new QpidException("Invalid destination null",null, null);
         }
     }
 
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java b/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java
index 601fd4e0ab..1ddc567e54 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java
@@ -20,15 +20,15 @@
  */
 package org.apache.qpidity.jms.message;
 
-import org.apache.qpidity.ReplyTo;
-import org.apache.qpidity.QpidException;
-
-import javax.jms.Message;
-import java.util.Map;
+import java.nio.ByteBuffer;
 import java.util.Enumeration;
-import java.util.Vector;
 import java.util.HashMap;
-import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.Vector;
+
+import org.apache.qpidity.ErrorCode;
+import org.apache.qpidity.QpidException;
+import org.apache.qpidity.ReplyTo;
 
 
 public class QpidMessage
@@ -170,7 +170,7 @@ public class QpidMessage
         {
             throw new QpidException(
                     "Problem when setting message delivery mode, " + deliveryMode + " is not a valid mode",
-                    "wrong delivery mode", null);
+                    ErrorCode.UNDEFINED, null);
         }
         _qpidityMessage.getDeliveryProperties().setDeliveryMode(deliveryMode);
     }