Merged with R3_3_branch

1 files changed, 45 insertions, 0 deletions

diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java
index e1de5ed1960..915883e05d3 100644
--- a/java/src/IceInternal/Network.java
+++ b/java/src/IceInternal/Network.java
@@ -317,6 +317,13 @@ public final class Network
             se.initCause(ex);
             throw se;
         }
+        catch(java.lang.SecurityException ex)
+        {
+            closeSocketNoThrow(fd);
+            Ice.SocketException se = new Ice.SocketException();
+            se.initCause(ex);
+            throw se;
+        }
 
         if(System.getProperty("os.name").equals("Linux"))
         {
@@ -827,6 +834,13 @@ public final class Network
         {
             Ice.DNSException e = new Ice.DNSException();
             e.host = host;
+            e.initCause(ex);
+            throw e;
+        }
+        catch(java.lang.SecurityException ex)
+        {
+            Ice.SocketException e = new Ice.SocketException();
+            e.initCause(ex);
             throw e;
         }
     
@@ -875,6 +889,12 @@ public final class Network
             se.initCause(e);
             throw se;
         }
+        catch(java.lang.SecurityException ex)
+        {
+            Ice.SocketException e = new Ice.SocketException();
+            e.initCause(ex);
+            throw e;
+        }
 
         return result;
     }
@@ -917,6 +937,12 @@ public final class Network
             catch(java.net.UnknownHostException ex)
             {
             }
+            catch(java.lang.SecurityException ex)
+            {
+                Ice.SocketException e = new Ice.SocketException();
+                e.initCause(ex);
+                throw e;
+            }
         }
 
         java.util.ArrayList<String> hosts = new java.util.ArrayList<String>();
@@ -1158,6 +1184,13 @@ public final class Network
         {
             Ice.DNSException e = new Ice.DNSException();
             e.host = host;
+            e.initCause(ex);
+            throw e;
+        }
+        catch(java.lang.SecurityException ex)
+        {
+            Ice.SocketException e = new Ice.SocketException();
+            e.initCause(ex);
             throw e;
         }
 
@@ -1191,6 +1224,12 @@ public final class Network
             assert(false);
             return null;
         }
+        catch(java.lang.SecurityException ex)
+        {
+            Ice.SocketException e = new Ice.SocketException();
+            e.initCause(ex);
+            throw e;
+        }
     }
 
     private static java.net.InetAddress[]
@@ -1215,5 +1254,11 @@ public final class Network
             assert(false);
             return null;
         }
+        catch(java.lang.SecurityException ex)
+        {
+            Ice.SocketException e = new Ice.SocketException();
+            e.initCause(ex);
+            throw e;
+        }
     }
 }