Changeset 1595 for branches/3.0-Beta2/components/server/src/ome/logic/AdminImpl.java

Timestamp:

06/05/07 15:01:00 (18 months ago)

Author:

jmoore

Message:

[MERGING] #728 fix into source:branches/3.0-Beta2

Files:

• branches/3.0-Beta2/components/server/src/ome/logic/AdminImpl.java (modified) (7 diffs)

branches/3.0-Beta2/components/server/src/ome/logic/AdminImpl.java

@@ -117 +117 @@
     /** injector for usage by the container. Not for general use */
     public final void setJdbcTemplate(SimpleJdbcTemplate jdbcTemplate) {
-        beanHelper.throwIfAlreadySet(this.jdbc, jdbcTemplate);
+        getBeanHelper().throwIfAlreadySet(this.jdbc, jdbcTemplate);
         jdbc = jdbcTemplate;
     }
@@ -123 +123 @@
     /** injector for usage by the container. Not for general use */
     public final void setExtendedMetadata(ExtendedMetadata extMetadata) {
-        beanHelper.throwIfAlreadySet(this.em, extMetadata);
+        getBeanHelper().throwIfAlreadySet(this.em, extMetadata);
         em = extMetadata;
     }
@@ -129 +129 @@
     /** injector for usage by the container. Not for general use */
     public final void setSessionFactory(SessionFactory sessions) {
-        beanHelper.throwIfAlreadySet(this.sf, sessions);
+        getBeanHelper().throwIfAlreadySet(this.sf, sessions);
         sf = sessions;
     }
@@ -320 +320 @@
         // using Spring utilities to get MBeanServer
         MBeanServer mbeanServer = JmxUtils.locateMBeanServer();
-        beanHelper.getLogger().debug("Acquired MBeanServer.");
+        getBeanHelper().getLogger().debug("Acquired MBeanServer.");
         ObjectName name;
         try {
@@ -327 +327 @@
             mbeanServer.invoke(name, "flushAuthenticationCaches",
                     new Object[] {}, new String[] {});
-            beanHelper.getLogger().debug("Flushed authentication caches.");
+            getBeanHelper().getLogger().debug("Flushed authentication caches.");
         } catch (InstanceNotFoundException infe) {
-            beanHelper.getLogger().warn(
+            getBeanHelper().getLogger().warn(
                     string + " not found. Won't synchronize login cache.");
         } catch (Exception e) {
@@ -603 +603 @@
 
         if (count == 0) {
-            beanHelper.getLogger().info(
+            getBeanHelper().getLogger().info(
                     "No password found for user " + e.getOmeName()
                             + ". Cannot delete.");
@@ -767 +767 @@
 
                     // reporting
-                    if (beanHelper.getLogger().isDebugEnabled()) {
-                        beanHelper.getLogger().debug(counts);
+                    if (getBeanHelper().getLogger().isDebugEnabled()) {
+                        getBeanHelper().getLogger().debug(counts);
                     }