db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r642950 - in /db/derby/code/branches/10.4/java: drda/org/apache/derby/impl/drda/ drda/org/apache/derby/mbeans/drda/ testing/org/apache/derbyTesting/functionTests/tests/management/
Date Mon, 31 Mar 2008 10:14:53 GMT
Author: kristwaa
Date: Mon Mar 31 03:14:46 2008
New Revision: 642950

URL: http://svn.apache.org/viewvc?rev=642950&view=rev
Log:
DERBY-3578: DrdaStreamOutBufferSize attribute of NetworkServerMBean should be of type int
instead of String.
Change merged to 10.4 branch from trunk revision 642948 (d3578_v01a.diff).

Modified:
    db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java
    db/derby/code/branches/10.4/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java

Modified: db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java?rev=642950&r1=642949&r2=642950&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java
(original)
+++ db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java
Mon Mar 31 03:14:46 2008
@@ -174,14 +174,14 @@
     }
     
     
-    public String getDrdaStreamOutBufferSize() {
+    public int getDrdaStreamOutBufferSize() {
         checkMonitor();
         
         // TODO - Fix NetworkServerControlImpl so that this setting is included
         //        in the property values returned by getPropertyValues()?
         //String size = getServerProperty(Property.DRDA_PROP_STREAMOUTBUFFERSIZE);
-        String size = PropertyUtil.getSystemProperty(
-                Property.DRDA_PROP_STREAMOUTBUFFERSIZE, "0");
+        int size = PropertyUtil.getSystemInt(
+                Property.DRDA_PROP_STREAMOUTBUFFERSIZE, 0);
         return size;
     }
 

Modified: db/derby/code/branches/10.4/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java?rev=642950&r1=642949&r2=642950&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java
(original)
+++ db/derby/code/branches/10.4/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java
Mon Mar 31 03:14:46 2008
@@ -29,14 +29,17 @@
  * This MBean is created and registered automatically at Network Server startup
  * if all requirements are met (J2SE 5.0 or better).</p>
  * <p>
- * Key properties for the registered MBean:
+ * Key properties for the registered MBean:</p>
  * <ul>
  * <li><code>type=NetworkServer</code></li>
  * <li><code>system=</code><em>runtime system identifier</em>
(see 
  *     <a href="../package-summary.html#package_description">description of 
  * package org.apache.derby.mbeans</a>)</li>
  * </ul>
- * 
+ * <p>
+ * If a security manager is installed, accessing attributes and operations of
+ * this MBean may require a <code>SystemPermission</code>; see individual method
+ * documentation for details.</p>
  * <p>
  * For more information on Managed Beans, refer to the JMX specification.</p>
  *
@@ -194,7 +197,7 @@
      * @return the size of the buffer used for streaming blob/clob from server 
      *         to client (<code>derby.drda.streamOutBufferSize</code>)
      */
-    public String getDrdaStreamOutBufferSize();
+    public int getDrdaStreamOutBufferSize();
     
     /**
      * <p>

Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java?rev=642950&r1=642949&r2=642950&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java
(original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java
Mon Mar 31 03:14:46 2008
@@ -223,7 +223,7 @@
     
     public void testAttributeDrdaStreamOutBufferSize() throws Exception {
         // assuming that the buffer size is 0 (default)
-        assertStringAttribute("0", 
+        assertIntAttribute(0,
                 getNetworkServerMBeanObjectName(), 
                 "DrdaStreamOutBufferSize");
     }



Mime
View raw message