Attachment 836338 Details for Bug 1033553 – Diff to illustrate the change

[patch] Diff to illustrate the change

ems.patch (text/plain), 6.28 KB, created by Heiko W. Rupp on 2013-12-13 14:08:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Heiko W. Rupp

Created: 2013-12-13 14:08:32 UTC

Size: 6.28 KB

patch

obsolete

>Index: build.xml
>===================================================================
>--- build.xml	(revision 629)
>+++ build.xml	(working copy)
>@@ -29,7 +29,7 @@
> 
>     <property name="module.jar" value="org-mc4j-ems.jar"/>
> 
>-    <property name="release.version" value="1.3"/>
>+    <property name="release.version" value="1.3.1"/>
> 
> 
>     <target name="init" description="Initializes the MC4J-EMS build system.">
>Index: src/ems/org/mc4j/ems/connection/bean/attribute/EmsAttribute.java
>===================================================================
>--- src/ems/org/mc4j/ems/connection/bean/attribute/EmsAttribute.java	(revision 629)
>+++ src/ems/org/mc4j/ems/connection/bean/attribute/EmsAttribute.java	(working copy)
>@@ -19,7 +19,7 @@
> 
> /**
>  * An MBean attribute.
>- * 
>+ *
>  * @author Greg Hinkle (ghinkle@users.sourceforge.net), Apr 4, 2005
>  * @version $Revision$($Author$ / $Date$)
>  */
>@@ -32,7 +32,7 @@
>     String CONTROL_ATTRIBUTE_HISTORY_DEPTH = "Attribute.history.depth";
> 
> 
>-    void registerAttributeChangeListener(AttributeChangeListener listener);
>+//    void registerAttributeChangeListener(AttributeChangeListener listener);
> 
>     /**
>      * Returns the locally stored value of this attribute. Does not ask the server for the current value.
>@@ -67,7 +67,7 @@
>      *
>      * @return
>      */
>-    ValueHistory getValueHistory();
>+//    ValueHistory getValueHistory();
> 
>     /**
>      *
>Index: src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/attribute/DAttribute.java
>===================================================================
>--- src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/attribute/DAttribute.java	(revision 629)
>+++ src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/attribute/DAttribute.java	(working copy)
>@@ -64,12 +64,12 @@
> 
>     protected boolean supportedType = true;
> 
>-    protected Set<AttributeChangeListener> changeListeners;
>+//    protected Set<AttributeChangeListener> changeListeners;
> 
>-    protected long lastRetrieved;
>+//    protected long lastRetrieved;
>     protected Object currentValue;
> 
>-    protected ValueHistory valueHistory;
>+//    protected ValueHistory valueHistory;
> 
>     protected LinkedList<Throwable> failures;
> 
>@@ -84,6 +84,7 @@
>      * Initializes internal storage settings for the value history
>      */
>     protected void init() {
>+/*
>         if (Boolean.valueOf(getControlProperty(CONTROL_ATTRIBUTE_HISTORY,"true"))) {
> 
>             String historyClass = getControlProperty(CONTROL_ATTRIBUTE_HISTORY_CLASS, null);
>@@ -103,6 +104,7 @@
>                 this.valueHistory = new CompleteValueHistory(Integer.valueOf(getControlProperty(CONTROL_ATTRIBUTE_HISTORY_DEPTH,"1")));
>             }
>         }
>+*/
>     }
> 
>     private String getControlProperty(String property,String defaultValue) {
>@@ -113,10 +115,10 @@
>     // TODO GH: Should you be able to register for a certain frequency? and then be guaranteed that the
>     // notifications won't be faster than that? Then the requests could be grouped as well
>     public synchronized void registerAttributeChangeListener(AttributeChangeListener listener) {
>-        if (changeListeners == null)
>-            changeListeners = new HashSet<AttributeChangeListener>();
>-
>-        changeListeners.add(listener);
>+//        if (changeListeners == null)
>+//            changeListeners = new HashSet<AttributeChangeListener>();
>+//
>+//        changeListeners.add(listener);
>     }
> 
> 
>@@ -127,12 +129,15 @@
>     }
> 
>     public int getValueSize() {
>+/*
>         if (valueHistory.getHistorySize() == 0) {
>             return 0;
>         } else {
> //            return com.vladium.utils.ObjectProfiler.sizeof(getValue());
>             return 0;
>         }
>+*/
>+        return 0;
>     }
> 
>     /**
>@@ -163,12 +168,12 @@
>     public void alterValue(Object newValue) {
>         if ((newValue != null && !newValue.equals(currentValue)) || (newValue == null && currentValue != null)) {
> 
>-            if (changeListeners != null && changeListeners.size() > 0) {
>-                AttributeChangeEvent event = new AttributeChangeEvent(this, currentValue, newValue);
>-                for (AttributeChangeListener listener : changeListeners) {
>-                    listener.attributeChange(event);
>-                }
>-            }
>+//            if (changeListeners != null && changeListeners.size() > 0) {
>+//                AttributeChangeEvent event = new AttributeChangeEvent(this, currentValue, newValue);
>+//                for (AttributeChangeListener listener : changeListeners) {
>+//                    listener.attributeChange(event);
>+//                }
>+//            }
>             // This old way stored attribute values if they were under a certain size
> //            if (com.vladium.utils.ObjectProfiler.sizeof(newValue) < 200)
> //            Don't do this if you're not going to bound it or have a way to disable it
>@@ -270,9 +275,11 @@
>         log.debug("Attribute access failure " + t.getLocalizedMessage(),t);
>     }
> 
>+/*
>     public org.mc4j.ems.store.ValueHistory getValueHistory() {
>         return valueHistory;
>     }
>+*/
> 
>     public String getName() {
>         return info.getName();
>Index: src/test/org/mc4j/ems/test/ConnectionTest.java
>===================================================================
>--- src/test/org/mc4j/ems/test/ConnectionTest.java	(revision 629)
>+++ src/test/org/mc4j/ems/test/ConnectionTest.java	(working copy)
>@@ -109,8 +109,8 @@
> //        settings.setCredentials("weblogic");
> //        settings.setPrincipal("weblogic");
> //        settings.setClassPathEntries(new File[] { new File("c:\\bea\\weblogic81\\server\\lib\\weblogic.jar")});
>-        
> 
>+
>         // Weblogic 9 - jsr 77 test
> //        settings.setConnectionName("test");
> //        settings.setServerUrl("service:jmx:t3://localhost:7001/jndi/weblogic.management.mbeanservers.runtime");//edit");//domainruntime");
>@@ -170,7 +170,7 @@
>                 for (EmsAttribute attribute : bean.getAttributes()) {
>                     if ("HeapFreeCurrent".equals(attribute.getName())) {
>                         System.out.println(bean.getBeanName().getCanonicalName() + " - " + attribute.getValue());
>-                        System.out.println("Tracking history: " + attribute.getValueHistory().getHistorySize());
>+//                        System.out.println("Tracking history: " + attribute.getValueHistory().getHistorySize());
>                     }
>                 }
>             }

Actions: View | Diff

Attachments on bug 1033553: 836338