QPID-4830 : [JMS AMQP 1.0] Improve error handling in the JMS client

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

6 files changed, 38 insertions, 65 deletions

diff --git a/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
index c3193f9fea..5e77b7097c 100644
--- a/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
@@ -173,7 +173,14 @@ public class Demo extends Util
             Section[] sections = { properties, appProperties, amqpValue};

             final Message message1 = new Message(Arrays.asList(sections));

 

-            s.send(message1);

+            try

+            {

+                s.send(message1);

+            }

+            catch (Exception e)

+            {

+                throw new RuntimeException(e);

+            }

 

             Map<Object, Sender> sendingLinks = new HashMap<Object, Sender>();

             Map<Object, Receiver> receivingLinks = new HashMap<Object, Receiver>();

@@ -295,7 +302,14 @@ public class Demo extends Util
                         m2propmap.put(VENDOR, vendor);

                         ApplicationProperties m2appProps = new ApplicationProperties(m2propmap);

                         Message m2 = new Message(Arrays.asList(m2props, m2appProps, new AmqpValue("AMQP-"+messageId)));

-                        sender.send(m2);

+                        try

+                        {

+                            sender.send(m2);

+                        }

+                        catch (Exception e)

+                        {

+                            throw new RuntimeException(e);

+                        }

 

                         Map m3propmap = new HashMap();

                         m3propmap.put(OPCODE, LOG);

@@ -307,8 +321,14 @@ public class Demo extends Util
 

                         Message m3 = new Message(Arrays.asList(new ApplicationProperties(m3propmap),

                                                                new AmqpValue("AMQP-"+messageId)));

-                        s.send(m3);

-

+                        try

+                        {

+                            s.send(m3);

+                        }

+                        catch (Exception e)

+                        {

+                            throw new RuntimeException(e);

+                        }

                     }

 

                     responseReceiver.acknowledge(m);

@@ -336,7 +356,14 @@ public class Demo extends Util
 

                             Message m3 = new Message(Arrays.asList(new ApplicationProperties(m3propmap),

                                                                    new AmqpValue("AMQP-"+mp.getMessageId())));

-                            s.send(m3);

+                            try

+                            {

+                                s.send(m3);

+                            }

+                            catch (Exception e)

+                            {

+                                throw new RuntimeException(e);

+                            }

 

                             entry.getValue().acknowledge(m);

                         }

diff --git a/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java
index 998d68cfa6..06440b8f19 100644
--- a/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java
@@ -121,14 +121,7 @@ public class Dump extends Util
             session.close();
             conn.close();
 
-        } catch (ConnectionException e)
-        {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-        catch (Sender.SenderCreationException e)
-        {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        } catch (Sender.SenderClosingException e)
+        } catch (Exception e)
         {
             e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
         }
diff --git a/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java
index 37550ea52f..c7bcd99312 100644
--- a/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java
@@ -248,27 +248,10 @@ public class Filesender extends Util
             session.close();
             conn.close();
         }
-        catch (ConnectionException e)
+        catch (Exception e)
         {
             e.printStackTrace();
         }
-        catch (Sender.SenderCreationException e)
-        {
-            e.printStackTrace();
-        } catch (FileNotFoundException e)
-        {
-            e.printStackTrace();
-        } catch (IOException e)
-        {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        } catch (NoSuchAlgorithmException e)
-        {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        } catch (Sender.SenderClosingException e)
-        {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-
     }
 
     private Message createMessageFromFile(MessageDigest md5, String fileName, File file) throws IOException
diff --git a/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java
index d8da58dc76..dbe273182f 100644
--- a/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java
@@ -216,23 +216,10 @@ public class Request extends Util
                 conn2.close();

             }

         }

-        catch (ConnectionException e)

+        catch (Exception e)

         {

             e.printStackTrace();  //TODO.

         }

-        catch (Sender.SenderClosingException e)

-        {

-            e.printStackTrace();  //TODO.

-        }

-        catch (Sender.SenderCreationException e)

-        {

-            e.printStackTrace();  //TODO.

-        }

-        catch (AmqpErrorException e)

-        {

-            e.printStackTrace();  //TODO.

-        }

-

     }

 

     protected boolean hasSingleLinkPerConnectionMode()

diff --git a/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java
index 6b1b70476e..1e4bcfc7d7 100644
--- a/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java
@@ -274,21 +274,13 @@ public class Respond extends Util
             _conn.close();
             System.out.println("Received: " + receivedCount);
         }
-        catch (ConnectionException e)
-        {
-            e.printStackTrace();  //TODO.
-        }
-        catch (Sender.SenderClosingException e)
-        {
-            e.printStackTrace();  //TODO.
-        }
-        catch (Sender.SenderCreationException e)
+        catch (Exception e)
         {
             e.printStackTrace();  //TODO.
         }
     }
 
-    private void respond(Message m) throws Sender.SenderCreationException, ConnectionClosedException
+    private void respond(Message m) throws Sender.SenderCreationException, ConnectionClosedException, LinkDetachedException
     {
         List<Section> sections = m.getPayload();
         String replyTo = null;
diff --git a/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java
index ef1a31005c..b4ae16ab3f 100644
--- a/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java
+++ b/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java
@@ -219,19 +219,10 @@ public class Send extends Util
             session.close();

             conn.close();

         }

-        catch (Sender.SenderClosingException e)

+        catch (Exception e)

         {

             e.printStackTrace();  //TODO.

         }

-        catch (ConnectionException e)

-        {

-            e.printStackTrace();  //TODO.

-        }

-        catch (Sender.SenderCreationException e)

-        {

-            e.printStackTrace();  //TODO.

-        }

-

 

     }