Author: jfrederic.clere(a)jboss.com
Date: 2011-10-12 10:29:54 -0400 (Wed, 12 Oct 2011)
New Revision: 1849
Modified:
trunk/java/org/apache/catalina/Service.java
trunk/java/org/apache/catalina/core/StandardService.java
Log:
Fix for AS7-2073.
Modified: trunk/java/org/apache/catalina/Service.java
===================================================================
--- trunk/java/org/apache/catalina/Service.java 2011-10-11 15:29:56 UTC (rev 1848)
+++ trunk/java/org/apache/catalina/Service.java 2011-10-12 14:29:54 UTC (rev 1849)
@@ -115,7 +115,7 @@
*
* @param connector The Connector to be added
*/
- public void addConnector(Connector connector);
+ public void addConnector(Connector connector) throws LifecycleException;
/**
* Find and return the set of Connectors associated with this Service.
Modified: trunk/java/org/apache/catalina/core/StandardService.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardService.java 2011-10-11 15:29:56 UTC (rev
1848)
+++ trunk/java/org/apache/catalina/core/StandardService.java 2011-10-12 14:29:54 UTC (rev
1849)
@@ -336,7 +336,7 @@
*
* @param connector The Connector to be added
*/
- public void addConnector(Connector connector) {
+ public void addConnector(Connector connector) throws LifecycleException {
synchronized (connectors) {
connector.setContainer(this.container);
@@ -351,6 +351,7 @@
connector.init();
} catch (LifecycleException e) {
log.error("Connector.initialize", e);
+ throw new LifecycleException("Can't initialize
Connector");
}
}
@@ -359,6 +360,7 @@
((Lifecycle) connector).start();
} catch (LifecycleException e) {
log.error("Connector.start", e);
+ throw new LifecycleException("Can't start Connector");
}
}
Show replies by date