cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r790654 - in /cxf/branches/2.2.x-fixes: ./ rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
Date Thu, 02 Jul 2009 16:28:23 GMT
Author: dkulp
Date: Thu Jul  2 16:28:22 2009
New Revision: 790654

URL: http://svn.apache.org/viewvc?rev=790654&view=rev
Log:
Merged revisions 790640 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r790640 | dkulp | 2009-07-02 12:19:27 -0400 (Thu, 02 Jul 2009) | 1 line
  
  Remove an instance field that wasn't needed.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  2 16:28:22 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790639
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790640

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java?rev=790654&r1=790653&r2=790654&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
Thu Jul  2 16:28:22 2009
@@ -64,7 +64,6 @@
     private MBServerConnectorFactory mcf;    
     private MBeanServer mbs;
     private Set<ObjectName> busMBeans = new HashSet<ObjectName>();
-    private ModelMBeanAssembler assembler;
     private boolean connectFailed;
     /**
      * For backward compatibility, {@link #createMBServerConnectorFactory} is <code>true</code>
by default.
@@ -75,7 +74,6 @@
     
     public InstrumentationManagerImpl() {
         super();
-        assembler = new ModelMBeanAssembler();
     }
     
     public Bus getBus() {
@@ -169,7 +167,7 @@
             registerMBeanWithServer(obj, name, forceRegistration);           
         } catch (NotCompliantMBeanException e) {        
             //If this is not a "normal" MBean, then try to deploy it using JMX annotations
-            assembler = new ModelMBeanAssembler();
+            ModelMBeanAssembler assembler = new ModelMBeanAssembler();
             ModelMBeanInfo mbi = assembler.getModelMbeanInfo(obj.getClass());
             register(obj, name, mbi, forceRegistration);
         }                



Mime
View raw message