java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 11 +++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit d225c159ea52ededd6c5e380afc110b20f1a43ec
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 22 15:15:11 2010 -0400
fixing new connection stuff to allow for the thin client
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
index 235a75a..da78a9c 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
@@ -156,12 +156,16 @@ class ConnectionManager {
String connectionUrl =
Config.get().getString("hibernate.connection.driver_proto") + ":";
String dbName = Config.get().getString("db_name");
- if (ConfigDefaults.get().isOracle()) {
+ String dbHost = Config.get().getString("db_host");
+ String dbPort = Config.get().getString("db_port");
+
+ if (ConfigDefaults.get().isOracle() &&
connectionUrl.contains("thin")) {
+ connectionUrl += "@" + dbHost + ":" + dbPort +
":" + dbName;
+ }
+ else if (ConfigDefaults.get().isOracle()) {
connectionUrl += "@" + dbName;
}
else {
- String dbHost = Config.get().getString("db_host");
- String dbPort = Config.get().getString("db_port");
if (dbHost != null && dbHost.length() > 0) {
connectionUrl += "//" + dbHost;
if (dbPort != null && dbPort.length() > 0) {
@@ -171,6 +175,7 @@ class ConnectionManager {
}
connectionUrl += dbName;
}
+ LOG.fatal(connectionUrl);
hibProperties.put("hibernate.connection.url", connectionUrl);
config.addProperties(hibProperties);
Show replies by date