Revision: 4129
Author:   seba.wagner
Date:     Mon Aug 29 13:01:09 2011
Log:      Preventing the exception from being thrown if init not complete
http://code.google.com/p/openmeetings/source/detail?r=4129

Modified:
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java

=======================================
--- /branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java Mon Aug 29 12:03:45 2011 +++ /branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java Mon Aug 29 13:01:09 2011
@@ -24,6 +24,9 @@

        private Configurationmanagement getConfigurationmanagement() {
                try {
+                       if (!ScopeApplicationAdapter.initComplete) {
+                               return null;
+                       }
                        ApplicationContext context = WebApplicationContextUtils
                                        
.getWebApplicationContext(getServletContext());
                        return (Configurationmanagement) 
context.getBean("cfgManagement");
@@ -39,8 +42,7 @@

                try {

-                       if (getConfigurationmanagement() == null
-                                       || 
!ScopeApplicationAdapter.initComplete) {
+                       if (getConfigurationmanagement() == null) {
                                return 
getVelocityView().getVelocityEngine().getTemplate(
                                                "booting.vm");
                        }

--
You received this message because you are subscribed to the Google Groups 
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/openmeetings-dev?hl=en.

Reply via email to