svn commit: r705229 - /tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java

[an...@apache.org]

Author: antelder
Date: Thu Oct 16 05:43:47 2008
New Revision: 705229

URL: http://svn.apache.org/viewvc?rev=705229&view=rev
Log:
Change private to protected so class can be subclassed

Modified:
    tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java

Modified: tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java?rev=705229&r1=705228&r2=705229&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java (original)
+++ tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java Thu Oct 16 05:43:47 2008
@@ -39,13 +39,13 @@
  */
 public class JMSResourceFactoryImpl implements JMSResourceFactory {
 
-    private String initialContextFactoryName;
-    private String connectionFactoryName = "ConnectionFactory";
-    private String jndiURL;
-
-    private Connection connection;
-    private Context context;
-    private boolean isConnectionStarted;
+    protected String initialContextFactoryName;
+    protected String connectionFactoryName = "ConnectionFactory";
+    protected String jndiURL;
+
+    protected Connection connection;
+    protected Context context;
+    protected boolean isConnectionStarted;
 
     public JMSResourceFactoryImpl(String connectionFactoryName, String initialContextFactoryName, String jndiURL) {
         if (connectionFactoryName != null && connectionFactoryName.trim().length() > 0) {
@@ -114,7 +114,7 @@
         }
     }
 
-    private void createConnection() throws NamingException, JMSException {
+    protected void createConnection() throws NamingException, JMSException {
         ConnectionFactory connectionFactory = (ConnectionFactory)jndiLookUp(connectionFactoryName);
         if (connectionFactory == null) {
             throw new JMSBindingException("connection factory not found: " + connectionFactoryName);
@@ -122,7 +122,7 @@
         connection = connectionFactory.createConnection();
     }
 
-    private synchronized Context getInitialContext() throws NamingException {
+    protected synchronized Context getInitialContext() throws NamingException {
         if (context == null) {
             Properties props = new Properties();
 
@@ -145,7 +145,7 @@
      * environment property needs to be set to initialize the ORB correctly. 
      * See: http://www-1.ibm.com/support/docview.wss?uid=swg24012804
      */
-    private void initJREEnvironment(Properties props) {
+    protected void initJREEnvironment(Properties props) {
         if ("com.ibm.websphere.naming.WsnInitialContextFactory".equals(props.get(Context.INITIAL_CONTEXT_FACTORY))) {
             String vendor = System.getProperty("java.vendor");
             if (vendor == null || !vendor.contains("IBM")) {
@@ -208,7 +208,7 @@
         Object o = null;
         try {
             o = getInitialContext().lookup("java:comp/env/" + name);
-        } catch (NamingException ex) {
+        } catch (Exception ex) {
             // ignore
         }
         if (o == null) {