svn commit: r476304 - /incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java

[boisvert]

Author: boisvert
Date: Fri Nov 17 12:33:44 2006
New Revision: 476304

URL: http://svn.apache.org/viewvc?view=rev&rev=476304
Log:
Only guess Hibernate dialect if not specified in hibernate.properties

Modified:
    incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java

Modified: 
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?view=diff&rev=476304&r1=476303&r2=476304
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java 
(original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java 
Fri Nov 17 12:33:44 2006
@@ -164,6 +164,7 @@
             _poller.stop();
             _poller = null;
         }
+        
         try {
             _server.stop();
         } catch (Throwable ex) {
@@ -367,14 +368,6 @@
                 HibernateTransactionManagerLookup.class.getName());
 //        properties.put(Environment.SESSION_FACTORY_NAME, "jta");
 
-        try {
-            properties.put(Environment.DIALECT, guessDialect(_datasource));
-        } catch (Exception ex) {
-            String errmsg = __msgs.msgOdeInitHibernateDialectDetectFailed();
-            __log.error(errmsg,ex);
-            throw new ServletException(errmsg,ex);
-        }
-
         File hibernatePropFile;
         String confDir = System.getProperty("org.apache.ode.configDir");
         if (confDir != null) hibernatePropFile = new File(confDir, 
"hibernate.properties");
@@ -386,16 +379,25 @@
                 fis = new FileInputStream(hibernatePropFile);
                 properties.load(new BufferedInputStream(fis));
             } catch (IOException e) {
-                String errmsg = __msgs
-                        
.msgOdeInitHibernateErrorReadingHibernateProperties(hibernatePropFile);
+                String errmsg = 
__msgs.msgOdeInitHibernateErrorReadingHibernateProperties(hibernatePropFile);
                 __log.error(errmsg, e);
                 throw new ServletException(errmsg, e);
             }
         } else {
-            __log.info(__msgs
-                    .msgOdeInitHibernatePropertiesNotFound(hibernatePropFile));
+            
__log.info(__msgs.msgOdeInitHibernatePropertiesNotFound(hibernatePropFile));
         }
 
+        // Guess Hibernate dialect if not specified in hibernate.properties
+        if (properties.get(Environment.DIALECT) == null) {
+            try {
+                properties.put(Environment.DIALECT, guessDialect(_datasource));
+            } catch (Exception ex) {
+                String errmsg = 
__msgs.msgOdeInitHibernateDialectDetectFailed();
+                if (__log.isDebugEnabled()) __log.error(errmsg,ex);
+                else __log.error(errmsg);
+            }
+        }
+        
         SessionManager sm = new SessionManager(properties, _datasource, 
_txMgr);
         _daoCF = new BpelDAOConnectionFactoryImpl(sm);
     }