Index: src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java =================================================================== --- src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java (revision 43986) +++ src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java (working copy) @@ -971,26 +971,30 @@ */ public void configureJKProperties(final NetworkListener listener) { - File propertiesFile = new File(listener.getJkConfigurationFile()); + File propertiesFile = null; + if (listener != null) { + propertiesFile = new File(listener.getJkConfigurationFile()); + } String propertyFile = System.getProperty("com.sun.enterprise.web.connector.enableJK.propertyFile"); - if (!propertiesFile.exists() && propertyFile!=null) { + if (propertiesFile!=null && !propertiesFile.exists() && propertyFile!=null) { propertiesFile = new File(propertyFile); } - if (!propertiesFile.exists()) { + if (propertiesFile==null) { if (_logger.isLoggable(Level.FINEST)) { _logger.finest("jk properties configuration file not defined"); } return; - } + } - if (_logger.isLoggable(Level.FINEST)) { - _logger.finest("Loading glassfish-jk.properties from " + propertiesFile.getAbsolutePath()); - } - if ( !propertiesFile.exists() ) { + if (!propertiesFile.exists()) { _logger.log(Level.WARNING, MessageFormat.format(_rb.getString("pewebcontainer.missingJKProperties"), propertiesFile.getAbsolutePath())); return; } + + if (_logger.isLoggable(Level.FINEST)) { + _logger.finest("Loading glassfish-jk.properties from " + propertiesFile.getAbsolutePath()); + } Properties properties = null;