diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2006-09-20 15:16:26 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2006-09-20 15:16:26 +0000 |
| commit | 4f66925c9700532467aa82f8eb531d80253d5612 (patch) | |
| tree | ca917e67dd665ffd55e458ffed6b3308b566fa98 /qpid/java/client | |
| parent | 966c20ce5c62f75113ddd140bd4374568bc00358 (diff) | |
| download | qpid-python-4f66925c9700532467aa82f8eb531d80253d5612.tar.gz | |
Added / to default JNDI name as under linux java.io.temp is '/tmp' but under windows it is '.../Temp/'
Queue and Topic fixed null pointer condition where _connection is not established.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@448234 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client')
3 files changed, 11 insertions, 5 deletions
diff --git a/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java b/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java index d0b9f99408..4bb83330e8 100644 --- a/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java +++ b/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java @@ -33,7 +33,7 @@ public class JNDIBindConnectionFactory { public static final String CONNECTION_FACTORY_BINDING = "amq/ConnectionFactory"; - public static final String DEFAULT_PROVIDER_FILE_PATH = System.getProperty("java.io.tmpdir") + "IBMPerfTestsJNDI"; + public static final String DEFAULT_PROVIDER_FILE_PATH = System.getProperty("java.io.tmpdir") + "/IBMPerfTestsJNDI"; public static final String PROVIDER_URL = "file:/" + DEFAULT_PROVIDER_FILE_PATH; public static final String FSCONTEXT_FACTORY = "com.sun.jndi.fscontext.RefFSContextFactory"; diff --git a/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java b/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java index 3b3d7850d8..9a24c36e70 100644 --- a/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java +++ b/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java @@ -35,7 +35,7 @@ public class JNDIBindQueue { public static final String CONNECTION_FACTORY_BINDING = "amq/ConnectionFactory"; - public static final String DEFAULT_PROVIDER_FILE_PATH = System.getProperty("java.io.tmpdir") + "IBMPerfTestsJNDI"; + public static final String DEFAULT_PROVIDER_FILE_PATH = System.getProperty("java.io.tmpdir") + "/IBMPerfTestsJNDI"; public static final String PROVIDER_URL = "file:/" + DEFAULT_PROVIDER_FILE_PATH; public static final String FSCONTEXT_FACTORY = "com.sun.jndi.fscontext.RefFSContextFactory"; @@ -89,7 +89,10 @@ public class JNDIBindQueue { try { - _connection.close(); + if (_connection != null) + { + _connection.close(); + } } catch (JMSException closeE) { diff --git a/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java b/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java index 437f3791c9..5a1d89ed2a 100644 --- a/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java +++ b/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java @@ -34,7 +34,7 @@ public class JNDIBindTopic { public static final String CONNECTION_FACTORY_BINDING = "amq/ConnectionFactory"; - public static final String DEFAULT_PROVIDER_FILE_PATH = System.getProperty("java.io.tmpdir") + "IBMPerfTestsJNDI"; + public static final String DEFAULT_PROVIDER_FILE_PATH = System.getProperty("java.io.tmpdir") + "/IBMPerfTestsJNDI"; public static final String PROVIDER_URL = "file:/" + DEFAULT_PROVIDER_FILE_PATH; public static final String FSCONTEXT_FACTORY = "com.sun.jndi.fscontext.RefFSContextFactory"; @@ -89,7 +89,10 @@ public class JNDIBindTopic { try { - _connection.close(); + if (_connection != null) + { + _connection.close(); + } } catch (JMSException closeE) { |