Merge pull request #118 from joeshannon/stackDump-isEmpty

#117 Check Status.getStackDump() is non-empty before use
epics-base · Sep 8, 2021 · 71b384b · 71b384b
2 parents 3a32ca5 + 2a35937
commit 71b384b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pvAccessJava/src/org/epics/pvaccess/client/rpc/RPCClientImpl.java b/pvAccessJava/src/org/epics/pvaccess/client/rpc/RPCClientImpl.java
@@ -129,10 +129,11 @@ public PVStructure request(PVStructure pvArgument, double timeout)
 					return result;
 				else
 				{
-					if (status.getStackDump() == null)
-						throw new RPCRequestException(status.getType(), status.getMessage());
+					String stackDump = status.getStackDump();
+					if (stackDump != null && !stackDump.isEmpty())
+						throw new RPCRequestException(status.getType(), status.getMessage() + ", cause:\n" + stackDump);
 					else
-						throw new RPCRequestException(status.getType(), status.getMessage() + ", cause:\n" + status.getStackDump());
+						throw new RPCRequestException(status.getType(), status.getMessage());
 				}
 			}
 			else

diff --git a/pvAccessJava/src/org/epics/pvaccess/server/impl/remote/rpc/ServerRPCService.java b/pvAccessJava/src/org/epics/pvaccess/server/impl/remote/rpc/ServerRPCService.java
@@ -288,8 +288,9 @@ public PVStructure execute() throws RPCRequestException {
 			if (!status.isSuccess())
 			{
 				String errorMessage = "failed to fetch channel list: " + status.getMessage();
-				if (status.getStackDump() != null)
-					errorMessage += "\n" + status.getStackDump();
+				String stackDump = status.getStackDump();
+				if (stackDump != null && !stackDump.isEmpty())
+					errorMessage += "\n" + stackDump;
 				throw new RPCRequestException(StatusType.ERROR, errorMessage);
 			}