[JENKINS-20769] Trying to fix/suppress some related observed or actua…

…l NPEs. java.lang.NullPointerException at hudson.remoting.ProxyOutputStream$Flush$1.run(ProxyOutputStream.java:305) at hudson.remoting.PipeWriter$1.run(PipeWriter.java:158) at java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source) at java.util.concurrent.FutureTask$Sync.innerRun(Unknown Source) at java.util.concurrent.FutureTask.run(Unknown Source) at hudson.remoting.SingleLaneExecutorService$1.run(SingleLaneExecutorService.java:111)
jenkinsci · Dec 17, 2013 · eb3a4c3 · eb3a4c3 · joshmoore · Jan 6, 2014
1 parent 622af09
commit eb3a4c3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/main/java/hudson/remoting/ProxyInputStream.java b/src/main/java/hudson/remoting/ProxyInputStream.java
@@ -149,6 +149,9 @@ public EOF(int oid) {
 
         protected void execute(Channel channel) {
             InputStream in = (InputStream) channel.getExportedObject(oid);
+            if (in == null) {
+                return;
+            }
             channel.unexport(oid);
             try {
                 in.close();

diff --git a/src/main/java/hudson/remoting/ProxyOutputStream.java b/src/main/java/hudson/remoting/ProxyOutputStream.java
@@ -299,6 +299,9 @@ public Flush(int ioId, int oid) {
 
         protected void execute(Channel channel) {
             final OutputStream os = (OutputStream) channel.getExportedObject(oid);
+            if (os == null) {
+                return;
+            }
             markForIoSync(channel,requestId,channel.pipeWriter.submit(ioId,new Runnable() {
                 public void run() {
                     try {
@@ -363,6 +366,9 @@ public EOF(int ioId, int oid) {
 
         protected void execute(final Channel channel) {
             final OutputStream os = (OutputStream) channel.getExportedObject(oid);
+            if (os == null) {
+                return;
+            }
             markForIoSync(channel,requestId,channel.pipeWriter.submit(ioId,new Runnable() {
                 public void run() {
                     channel.unexport(oid);