TRUNK-4300 - OpenmrsCookieThemeResolver should never throw an excepti…

…on, because that would break the uncaughtException page (cherry picked from commit cf9f6e1)
openmrs · Mar 5, 2014 · f94a2c2 · f94a2c2
1 parent db284a1
commit f94a2c2
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/web/src/main/java/org/openmrs/web/OpenmrsCookieThemeResolver.java b/web/src/main/java/org/openmrs/web/OpenmrsCookieThemeResolver.java
@@ -21,6 +21,9 @@
 /**
  * Customization of the spring theme resolver so that an admin can set a global property for the
  * default locale for the system
+ *
+ * This class will not throw an exception even if there is a problem retrieving that global property, since that
+ * prevent even an error page from being displayed properly
  */
 public class OpenmrsCookieThemeResolver extends CookieThemeResolver {
 
@@ -45,6 +48,10 @@ public String getDefaultThemeName() {
 			// check the admin-set global property for the theme
 			themeName = Context.getAdministrationService().getGlobalProperty(GP_THEME_NAME);
 		}
+		catch (Exception ex) {
+			// We must not throw an exception here, since this code is called from every page including the
+			// for uncaught exceptions. Therefore we pass, and fall back to default behavior.
+		}
 		finally {
 			// only close the session if we opened it
 			if (openedSession)