From 99b433bf5f528a658f06446f6da1651669a53204 Mon Sep 17 00:00:00 2001 From: Björn Hagemeister Date: Tue, 11 Nov 2014 15:44:28 +0100 Subject: Added null pointer check. --- .../org/openslx/network/StaticProxySelector.java | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'src/main/java/org/openslx/network') diff --git a/src/main/java/org/openslx/network/StaticProxySelector.java b/src/main/java/org/openslx/network/StaticProxySelector.java index de872d9..b957728 100644 --- a/src/main/java/org/openslx/network/StaticProxySelector.java +++ b/src/main/java/org/openslx/network/StaticProxySelector.java @@ -41,19 +41,23 @@ public class StaticProxySelector extends ProxySelector List nWI = getNetworkInterfaces(); - // iterate over network interfaces and check for InetAddresses. - for ( int i = 0; i < nWI.size(); ++i ) { - Enumeration e = nWI.get( i ).getInetAddresses(); - // iterate over InetAddresses of current interface. - while ( e.hasMoreElements() ) { - InetAddress address = (InetAddress)e.nextElement(); - // Add proxy to list, if host do not equals to address. - if ( ! ( host.equals( address ) ) && - ! ( host.startsWith( "127." ) ) && - ! ( host.equals( "localhost" ) ) ) { - proxyList.add( this.proxy ); + if ( nWI != null ) { + // iterate over network interfaces and check for InetAddresses. + for ( int i = 0; i < nWI.size(); ++i ) { + Enumeration e = nWI.get( i ).getInetAddresses(); + // iterate over InetAddresses of current interface. + while ( e.hasMoreElements() ) { + InetAddress address = (InetAddress)e.nextElement(); + // Add proxy to list, if host do not equals to address. + if ( ! ( host.equals( address ) ) && + ! ( host.startsWith( "127." ) ) && + ! ( host.equals( "localhost" ) ) ) { + proxyList.add( this.proxy ); + } } } + } else if ( ! ( host.startsWith( "127." ) ) && ! ( host.equals( "localhost" ) ) ) { + proxyList.add( this.proxy ); } // log.info( "proxyList: " + proxyList.toString() ); return proxyList; -- cgit v1.2.3-55-g7522