[cvs] expresso commit by lhamel: handle exceptions in
RequestRegistry call
JCorporate Ltd
jcorp at jcorporate.com
Thu Dec 9 06:45:45 UTC 2004
Log Message:
-----------
handle exceptions in RequestRegistry call
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc:
DateTime.java
EMailSender.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security:
User.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj:
Setup.java
Revision Data
-------------
Index: User.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java -u -r1.49 -r1.50
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java
@@ -422,6 +422,17 @@
} /* getAllUsers() */
+ private static String getDataContextFromRegistry() {
+ String dbName = null;
+ try {
+ dbName = RequestRegistry.getDataContext();
+ } catch (Exception ex) {
+ dbName = DBConnection.DEFAULT_DB_CONTEXT_NAME;
+ }
+ return dbName;
+ }
+
+
/**
* Returns the currently set DB context
*
@@ -429,10 +440,7 @@
*/
public String getDataContext() {
if ((dbName == null) || (dbName.trim().equals(""))) {
- dbName = RequestRegistry.getDataContext();
- if (dbName == null) {
- dbName = DBConnection.DEFAULT_DB_CONTEXT_NAME;
- }
+ String dbName = getDataContextFromRegistry();
try {
getUserInfo().setDBName(dbName);
} catch (DBException e) {
@@ -1201,7 +1209,7 @@
* @throws DBException upon error
*/
public static int getAdminId() throws DBException {
- String dbname = RequestRegistry.getDataContext();
+ String dbname = getDataContextFromRegistry();
if ( dbname == null ) dbname = DBConnection.DEFAULT_DB_CONTEXT_NAME;
return getAdminId(dbname);
}
@@ -1316,10 +1324,7 @@
*/
public static int getIdFromLogin(String login) throws DBException {
User user = new User();
- String dbname = RequestRegistry.getDataContext();
- if (dbname == null) {
- dbname = DBConnection.DEFAULT_DB_CONTEXT_NAME;
- }
+ String dbname = getDataContextFromRegistry();
user.setDataContext(dbname);
user.setLoginName(login);
if (!user.find()) {
@@ -1357,10 +1362,7 @@
*/
public static User getUserFromId(int uid) throws DBException {
User user = new User();
- String dbname = RequestRegistry.getDataContext();
- if (dbname == null) {
- dbname = DBConnection.DEFAULT_DB_CONTEXT_NAME;
- }
+ String dbname = getDataContextFromRegistry();
user.setDataContext(dbname);
user.setUid(uid);
if (!user.find()) {
Index: DateTime.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/DateTime.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/DateTime.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/DateTime.java -u -r1.23 -r1.24
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/DateTime.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/DateTime.java
@@ -121,10 +121,7 @@
* @return String The formatted date time field
*/
public static String getDateTimeForDB() throws com.jcorporate.expresso.core.db.DBException {
- String dbname = RequestRegistry.getDataContext();
- if (dbname == null) {
- dbname = DBConnection.DEFAULT_DB_CONTEXT_NAME;
- }
+ String dbname = getDataContextFromRegistry();
return getDateTimeForDB(new Date(), dbname);
} /* getDateTimeForDB() */
@@ -310,10 +307,7 @@
* @return String The formatted time field
*/
public static String getTimeForDB(Date date) throws com.jcorporate.expresso.core.db.DBException {
- String dbname = RequestRegistry.getDataContext();
- if (dbname == null) {
- dbname = DBConnection.DEFAULT_DB_CONTEXT_NAME;
- }
+ String dbname = getDataContextFromRegistry();
return getTimeForDB(date, dbname);
} /* getTimeForDB(Date) */
@@ -383,11 +377,7 @@
cal.set(Calendar.MONTH, mon);
cal.set(Calendar.DAY_OF_MONTH, day);
- String dbname = RequestRegistry.getDataContext();
- if (dbname == null) {
- dbname = DBConnection.DEFAULT_DB_CONTEXT_NAME;
- }
-
+ String dbname = getDataContextFromRegistry();
return getDateForDB(cal.getTime(), dbname);
} /* getTimeForDB(int, int, int) */
@@ -400,10 +390,7 @@
* @return String The formatted date field
*/
public static String getDateForDB(Date date) throws com.jcorporate.expresso.core.db.DBException {
- String dbname = RequestRegistry.getDataContext();
- if (dbname == null) {
- dbname = DBConnection.DEFAULT_DB_CONTEXT_NAME;
- }
+ String dbname = getDataContextFromRegistry();
return getDateForDB(date, dbname);
} /* getTimeForDB(Date) */
@@ -568,6 +555,17 @@
}
return "";
}
+
+ private static String getDataContextFromRegistry() {
+ String dbName = null;
+ try {
+ dbName = RequestRegistry.getDataContext();
+ } catch (Exception ex) {
+ dbName = DBConnection.DEFAULT_DB_CONTEXT_NAME;
+ }
+ return dbName;
+ }
+
/**
* DateFormat items in sDateFormatStrings hash table.
Index: EMailSender.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java -u -r1.19 -r1.20
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java
@@ -253,8 +253,7 @@
*/
public String getDataContext() {
if ((dbName == null) || (dbName.trim().equals(""))) {
- dbName = RequestRegistry.getDataContext();
- if ( dbName == null) dbName = DBConnection.DEFAULT_DB_CONTEXT_NAME;
+ dbName = getDataContextFromRegistry();
}
return dbName;
} /* getDataContext() */
@@ -738,6 +737,16 @@
*/
public void setMaxConnectRetries(int maxConnectRetries) {
this.maxConnectRetries = maxConnectRetries;
+ }
+
+ private static String getDataContextFromRegistry() {
+ String dbName = null;
+ try {
+ dbName = RequestRegistry.getDataContext();
+ } catch (Exception ex) {
+ dbName = DBConnection.DEFAULT_DB_CONTEXT_NAME;
+ }
+ return dbName;
}
} /* EMailSender */
Index: Setup.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Setup.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Setup.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Setup.java -u -r1.31 -r1.32
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Setup.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Setup.java
@@ -248,7 +248,7 @@
public static String getValue(String setupCode)
throws DBException {
- String dbName = RequestRegistry.getDataContext();
+ String dbName = getDataContextFromRegistry();
if (tableNotExists.contains(dbName)) {
if (log.isDebugEnabled()) {
log.debug("No setup info yet for db " + dbName);
@@ -261,6 +261,16 @@
setupCode);
} /* getValue(String) */
+ private static String getDataContextFromRegistry() {
+ String dbName = null;
+ try {
+ dbName = RequestRegistry.getDataContext();
+ } catch (Exception ex) {
+ dbName = DBConnection.DEFAULT_DB_CONTEXT_NAME;
+ }
+ return dbName;
+ }
+
/**
* Get a config value for the default schema
@@ -388,7 +398,7 @@
public static String getValueUnrequired(String setupCode) {
String setupValue = null;
- String dbName = RequestRegistry.getDataContext();
+ String dbName = getDataContextFromRegistry();
try {
setupValue = getValue(dbName, setupCode);
// getvalue can return "" for some error cases
@@ -505,7 +515,7 @@
*/
public static String getValueRequired(String setupCode)
throws DBException {
- String dbName = RequestRegistry.getDataContext();
+ String dbName = getDataContextFromRegistry();
return getValueRequired(dbName, setupCode);
} /* getValueRequired(String) */
More information about the cvs
mailing list