From d0e5054d19bdce6d443859dbd6c8b15669a1eff3 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Fri, 3 Apr 2009 00:48:54 +0000
Subject: [PATCH] improved error handling after seeing
 http://www.nabble.com/ClassNotFoundException-and-distributed-hudson-td22811408.html

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@16841 71c3de6d-444a-0410-be80-ed276b4c234a
---
 remoting/src/main/java/hudson/remoting/UserRequest.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/remoting/src/main/java/hudson/remoting/UserRequest.java b/remoting/src/main/java/hudson/remoting/UserRequest.java
index 1c901880c8..253f45a3f2 100644
--- a/remoting/src/main/java/hudson/remoting/UserRequest.java
+++ b/remoting/src/main/java/hudson/remoting/UserRequest.java
@@ -81,7 +81,12 @@ final class UserRequest<RSP,EXC extends Throwable> extends Request<UserResponse<
             RSP r = null;
             Channel oldc = Channel.setCurrent(channel);
             try {
-                Object o = new ObjectInputStreamEx(new ByteArrayInputStream(request), cl).readObject();
+                Object o;
+                try {
+                    o = new ObjectInputStreamEx(new ByteArrayInputStream(request), cl).readObject();
+                } catch (ClassNotFoundException e) {
+                    throw new ClassNotFoundException("Failed to deserialize the Callable object. Perhaps you needed to implement DelegatingCallable?",e);
+                }
 
                 Callable<RSP,EXC> callable = (Callable<RSP,EXC>)o;
 
-- 
GitLab