Fixes #1090 - Improve IllegalStateExceptions error message.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
cometd · Nov 16, 2021 · 543fdf3 · 543fdf3
1 parent 2b18b9e
commit 543fdf3
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/...ava/cometd-java-api/cometd-java-api-common/src/main/java/org/cometd/bayeux/ChannelId.java b/...ava/cometd-java-api/cometd-java-api-common/src/main/java/org/cometd/bayeux/ChannelId.java
@@ -300,7 +300,7 @@ public boolean matches(ChannelId channelId) {
                 return true;
             }
             default: {
-                throw new IllegalStateException();
+                throw new IllegalStateException("Invalid wild value " + _wild + " for " + this);
             }
         }
     }

diff --git a/...d-java-client/cometd-java-client-common/src/main/java/org/cometd/client/BayeuxClient.java b/...d-java-client/cometd-java-client-common/src/main/java/org/cometd/client/BayeuxClient.java
@@ -314,10 +314,11 @@ public void handshake(MessageListener callback) {
 
     @Override
     public void handshake(Map<String, Object> fields, MessageListener callback) {
-        if (getState() == State.DISCONNECTED) {
+        State state = getState();
+        if (state == State.DISCONNECTED) {
             sessionState.submit(() -> sessionState.handshaking(fields, callback));
         } else {
-            throw new IllegalStateException();
+            throw new IllegalStateException("Invalid state " + state);
         }
     }
 
@@ -1172,7 +1173,7 @@ private boolean isUpdateableTo(State newState) {
                 case TERMINATING:
                     return newState == DISCONNECTED;
                 default:
-                    throw new IllegalStateException();
+                    throw new IllegalStateException("Could not update state from " + this + " to " + newState);
             }
         }
     }
@@ -1763,7 +1764,7 @@ public void handle(ClientTransport.FailureInfo failureInfo) {
                         break;
                     }
                     default: {
-                        throw new IllegalStateException();
+                        throw new IllegalStateException("Could not handle transport failure in state " + newState);
                     }
                 }
             });

diff --git a/...t-common/src/main/java/org/cometd/client/websocket/common/AbstractWebSocketTransport.java b/...t-common/src/main/java/org/cometd/client/websocket/common/AbstractWebSocketTransport.java
@@ -333,7 +333,7 @@ private void registerMessage(Message.Mutable message, TransportListener listener
             Object existing = _exchanges.put(message.getId(), exchange);
             // Paranoid check
             if (existing != null) {
-                throw new IllegalStateException();
+                throw new IllegalStateException("Could not register exchange " + exchange + ", existing exchange is " + existing + " for message " + message);
             }
         }
 

diff --git a/cometd-java/cometd-java-common/src/main/java/org/cometd/common/AsyncFoldLeft.java b/cometd-java/cometd-java-common/src/main/java/org/cometd/common/AsyncFoldLeft.java
@@ -198,7 +198,7 @@ void run() {
                             promise.fail(failure.get());
                             return;
                         default:
-                            throw new IllegalStateException();
+                            throw new IllegalStateException("Could not run loop in state " + current);
                     }
                 }
             }
@@ -224,7 +224,7 @@ public void proceed(R r) {
                         }
                         break;
                     default:
-                        throw new IllegalStateException();
+                        throw new IllegalStateException("Could not proceed loop in state " + current);
                 }
             }
         }
@@ -247,7 +247,7 @@ public void leave(R r) {
                         }
                         break;
                     default:
-                        throw new IllegalStateException();
+                        throw new IllegalStateException("Could not leave loop in state " + current);
                 }
             }
         }
@@ -270,7 +270,7 @@ public void fail(Throwable x) {
                         }
                         break;
                     default:
-                        throw new IllegalStateException();
+                        throw new IllegalStateException("Could not fail loop in state " + current);
                 }
             }
         }

diff --git a/cometd-java/cometd-java-oort/src/main/java/org/cometd/oort/OortObject.java b/cometd-java/cometd-java-oort/src/main/java/org/cometd/oort/OortObject.java
@@ -785,8 +785,8 @@ D get() {
                 try {
                     latch.await();
                     return result;
-                } catch (InterruptedException e) {
-                    throw new IllegalStateException();
+                } catch (InterruptedException x) {
+                    throw new IllegalStateException("Interrupted while waiting for deferred result", x);
                 }
             }
         }

diff --git a/...va-server/cometd-java-server-common/src/main/java/org/cometd/server/LocalSessionImpl.java b/...va-server/cometd-java-server-common/src/main/java/org/cometd/server/LocalSessionImpl.java
@@ -85,7 +85,7 @@ public ServerSession getServerSession() {
     @Override
     public void handshake(Map<String, Object> template, ClientSession.MessageListener callback) {
         if (_session != null) {
-            throw new IllegalStateException();
+            throw new IllegalStateException("Method handshake() invoke multiple times for local session " + this);
         }
 
         ServerSessionImpl session = new ServerSessionImpl(_bayeux, this, _idHint);

diff --git a/...server/cometd-java-server-common/src/main/java/org/cometd/server/ext/BatchArrayQueue.java b/...server/cometd-java-server-common/src/main/java/org/cometd/server/ext/BatchArrayQueue.java
@@ -57,7 +57,7 @@ public boolean offer(T t) {
                 int capacity = elements.length;
                 int newCapacity = 2 * capacity;
                 if (newCapacity < 0) {
-                    throw new IllegalStateException();
+                    throw new IllegalStateException("Could not double up capacity " + capacity);
                 }
 
                 @SuppressWarnings("unchecked")

diff --git a/...er/cometd-java-server-common/src/main/java/org/cometd/server/http/AsyncJSONTransport.java b/...er/cometd-java-server-common/src/main/java/org/cometd/server/http/AsyncJSONTransport.java
@@ -320,7 +320,8 @@ public void onWritePossible() throws IOException {
             }
 
             while (true) {
-                switch (state) {
+                State current = state;
+                switch (current) {
                     case BEGIN: {
                         state = State.HANDSHAKE;
                         if (!writeBegin(output)) {
@@ -362,7 +363,7 @@ public void onWritePossible() throws IOException {
                         return;
                     }
                     default: {
-                        throw new IllegalStateException();
+                        throw new IllegalStateException("Could not write in state " + current);
                     }
                 }
             }