From 8dcf271e08daaf4e43998fabd650cb9437db67ab Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Wed, 27 Mar 2013 17:36:14 +0100
Subject: [PATCH] NPE fix

---
 .../src/org/apache/xmlrpc/IdeaAwareWebServer.java           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/org/apache/xmlrpc/IdeaAwareWebServer.java b/platform/platform-impl/src/org/apache/xmlrpc/IdeaAwareWebServer.java
index 9f7136efa3dd..ee389314b385 100644
--- a/platform/platform-impl/src/org/apache/xmlrpc/IdeaAwareWebServer.java
+++ b/platform/platform-impl/src/org/apache/xmlrpc/IdeaAwareWebServer.java
@@ -17,6 +17,7 @@ package org.apache.xmlrpc;
 
 import java.io.IOException;
 import java.net.InetAddress;
+import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -108,7 +109,10 @@ public class IdeaAwareWebServer extends WebServer {
   public void shutdown() {
     super.shutdown();
     try {
-      serverSocket.close();
+      ServerSocket socket = serverSocket;
+      if (socket != null) {
+        socket.close();
+      }
     }
     catch (IOException e) {
       //pass