summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2009-04-17 14:47:57 +0000
committerMartin Ritchie <ritchiem@apache.org>2009-04-17 14:47:57 +0000
commit049d3d4b61fd0dc34967995ec20f70554d6c2e32 (patch)
treef40a50d90c1fe21687a859a425c39325bde79d28
parentf84ceed4318dd16171a10b7255f7ff21dd494e51 (diff)
downloadqpid-python-049d3d4b61fd0dc34967995ec20f70554d6c2e32.tar.gz
Eat IllegalArgumentException when creating the signal handler, fixes startup on Windows.
merged from trunk r766025 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@766038 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
index 28a07e7ebf..24add696b3 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
@@ -100,7 +100,15 @@ public class ServerConfiguration implements SignalHandler
{
this(parseConfig(configurationURL));
_configFile = configurationURL;
- sun.misc.Signal.handle(new sun.misc.Signal("HUP"), this);
+ try
+ {
+ Signal sig = new sun.misc.Signal("HUP");
+ sun.misc.Signal.handle(sig, this);
+ }
+ catch (IllegalArgumentException e)
+ {
+ // We're on something that doesn't handle SIGHUP, how sad, Windows.
+ }
}
public ServerConfiguration(Configuration conf) throws ConfigurationException