changeset in /hg/icedtea: Bump to b39.

Andrew John Hughes gnu_andrew at member.fsf.org
Sun Nov 9 17:38:16 PST 2008


changeset 3c4aa7011748 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3c4aa7011748
description:
	Bump to b39.

	2008-11-09  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am: Bump to b39.
		* patches/icedtea-hotspot-use-idx_t.patch,
		* patches/icedtea-security-updates.patch:
		Remove parts applied/changed in b39.

diffstat:

4 files changed, 21 insertions(+), 440 deletions(-)
ChangeLog                               |    7 
Makefile.am                             |    6 
patches/icedtea-hotspot-use-idx_t.patch |  257 +------------------------------
patches/icedtea-security-updates.patch  |  191 -----------------------

diffs (truncated from 513 to 500 lines):

diff -r e61d84115155 -r 3c4aa7011748 ChangeLog
--- a/ChangeLog	Fri Nov 07 16:31:49 2008 -0500
+++ b/ChangeLog	Mon Nov 10 01:38:03 2008 +0000
@@ -1,3 +1,10 @@ 2008-11-07  Omair Majid  <omajid at redhat.
+2008-11-09  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Bump to b39.
+	* patches/icedtea-hotspot-use-idx_t.patch,
+	* patches/icedtea-security-updates.patch:
+	Remove parts applied/changed in b39.
+	
 2008-11-07  Omair Majid  <omajid at redhat.com>
 
 	* patches/icedtea-jsoundhs.patch: Added two more diffs to remove all uses 
diff -r e61d84115155 -r 3c4aa7011748 Makefile.am
--- a/Makefile.am	Fri Nov 07 16:31:49 2008 -0500
+++ b/Makefile.am	Mon Nov 10 01:38:03 2008 +0000
@@ -1,6 +1,6 @@ OPENJDK_DATE = 23_oct_2008
-OPENJDK_DATE = 23_oct_2008
-OPENJDK_MD5SUM = 2893ceeae804ce4f7e268388afed3449
-OPENJDK_VERSION = b38
+OPENJDK_DATE = 06_nov_2008
+OPENJDK_MD5SUM = 57062779a3c844621865faef8d423ad9
+OPENJDK_VERSION = b39
 
 CACAO_VERSION = 0.99.3
 CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
diff -r e61d84115155 -r 3c4aa7011748 patches/icedtea-hotspot-use-idx_t.patch
--- a/patches/icedtea-hotspot-use-idx_t.patch	Fri Nov 07 16:31:49 2008 -0500
+++ b/patches/icedtea-hotspot-use-idx_t.patch	Mon Nov 10 01:38:03 2008 +0000
@@ -1,65 +1,9 @@
---- openjdk/hotspot/src/share/vm/oops/generateOopMap.hpp.orig	2008-07-10 22:04:33.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/oops/generateOopMap.hpp	2008-08-14 23:08:36.000000000 +0200
-@@ -341,7 +341,7 @@
-   BasicBlock *    _basic_blocks;             // Array of basicblock info
-   int             _gc_points;
-   int             _bb_count;
--  uintptr_t *     _bb_hdr_bits;
-+  size_t *     _bb_hdr_bits;
+diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/methodLiveness.cpp openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp
+--- openjdk.orig/hotspot/src/share/vm/compiler/methodLiveness.cpp	2008-11-06 08:40:55.000000000 +0000
++++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp	2008-11-10 00:55:09.000000000 +0000
+@@ -567,15 +567,15 @@
  
-   // Basicblocks methods
-   void          initialize_bb               ();
---- openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp.orig	2008-08-14 22:58:36.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp	2008-08-14 23:03:33.000000000 +0200
-@@ -374,19 +374,19 @@
-   _gc_points = 0;
-   _bb_count  = 0;    
-   int size = binsToHold(method()->code_size());
--  _bb_hdr_bits = NEW_RESOURCE_ARRAY(uintptr_t,size);
--  memset(_bb_hdr_bits, 0, size*sizeof(uintptr_t));
-+  _bb_hdr_bits = NEW_RESOURCE_ARRAY(size_t,size);
-+  memset(_bb_hdr_bits, 0, size*sizeof(size_t));
- }
-  
- void GenerateOopMap ::set_bbmark_bit(int bci) {
-   int idx  = bci >> LogBitsPerWord;
--  uintptr_t bit = (uintptr_t)1 << (bci & (BitsPerWord-1));
-+  size_t bit = (size_t)1 << (bci & (BitsPerWord-1));
-   _bb_hdr_bits[idx] |= bit;
- }
  
- void GenerateOopMap ::clear_bbmark_bit(int bci) {
-   int idx   = bci >> LogBitsPerWord;
--  uintptr_t bit = (uintptr_t)1 << (bci & (BitsPerWord-1));
-+  size_t bit = (size_t)1 << (bci & (BitsPerWord-1));
-   _bb_hdr_bits[idx] &= (~bit);
- }
- 
-@@ -1027,7 +1027,7 @@
-          "new method size is too small");
-   int newWords = binsToHold(new_method_size);
- 
--  uintptr_t * new_bb_hdr_bits = NEW_RESOURCE_ARRAY(uintptr_t, newWords);
-+  size_t * new_bb_hdr_bits = NEW_RESOURCE_ARRAY(size_t, newWords);
- 
-   BitMap bb_bits(new_bb_hdr_bits, new_method_size);
-   bb_bits.clear();
---- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.orig	2008-07-10 22:04:31.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2008-08-14 22:59:30.000000000 +0200
-@@ -6162,7 +6162,7 @@
-   }
-   assert(_virtual_space.committed_size() == brs.size(),
-          "didn't reserve backing store for all of CMS bit map?");
--  _bm.set_map((uintptr_t*)_virtual_space.low());
-+  _bm.set_map((size_t*)_virtual_space.low());
-   assert(_virtual_space.committed_size() << (_shifter + LogBitsPerByte) >=
-          _bmWordSize, "inconsistency in bit map sizing");
-   _bm.set_size(_bmWordSize >> _shifter);
---- openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp.orig	2008-07-10 22:04:30.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp	2008-08-14 22:59:30.000000000 +0200
-@@ -569,15 +569,15 @@
- 
-     
  MethodLiveness::BasicBlock::BasicBlock(MethodLiveness *analyzer, int start, int limit) :
 -         _gen((uintptr_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
 +         _gen((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
@@ -78,7 +22,7 @@
                           analyzer->bit_map_size_bits()),
           _last_bci(-1) {
    _analyzer = analyzer;
-@@ -994,7 +994,7 @@
+@@ -992,7 +992,7 @@
  }
  
  MethodLivenessResult MethodLiveness::BasicBlock::get_liveness_at(ciMethod* method, int bci) {
@@ -87,196 +31,15 @@
                  _analyzer->bit_map_size_bits());
    answer.set_is_valid();
  
---- openjdk/hotspot/src/share/vm/compiler/methodLiveness.hpp.orig	2008-07-10 22:04:30.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.hpp	2008-08-14 22:59:30.000000000 +0200
-@@ -32,7 +32,7 @@
-   bool _is_valid;
- 
-  public:
--  MethodLivenessResult(uintptr_t* map, idx_t size_in_bits)
-+  MethodLivenessResult(idx_t* map, idx_t size_in_bits)
-     : BitMap(map, size_in_bits)
-     , _is_valid(false)
-   {}
---- openjdk/hotspot/src/share/vm/utilities/bitMap.cpp.orig	2008-07-10 22:04:37.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/utilities/bitMap.cpp	2008-08-14 23:06:51.000000000 +0200
-@@ -46,7 +46,7 @@
- void BitMap::resize(idx_t size_in_bits) {
-   assert(size_in_bits >= 0, "just checking");
-   size_t old_size_in_words = size_in_words();
--  uintptr_t* old_map = map();
-+  idx_t* old_map = map();
-   _size = size_in_bits;
-   size_t new_size_in_words = size_in_words();
-   _map = NEW_RESOURCE_ARRAY(idx_t, new_size_in_words);
-@@ -109,11 +109,11 @@
- }
- 
- inline void BitMap::set_large_range_of_words(idx_t beg, idx_t end) {
--  memset(_map + beg, ~(unsigned char)0, (end - beg) * sizeof(uintptr_t));
-+  memset(_map + beg, ~(unsigned char)0, (end - beg) * sizeof(idx_t));
- }
- 
- inline void BitMap::clear_large_range_of_words(idx_t beg, idx_t end) {
--  memset(_map + beg, 0, (end - beg) * sizeof(uintptr_t));
-+  memset(_map + beg, 0, (end - beg) * sizeof(idx_t));
- }
- 
- inline BitMap::idx_t BitMap::word_index_round_up(idx_t bit) const {
-@@ -285,11 +285,11 @@
- 
- bool BitMap::contains(const BitMap other) const {
-   assert(size() == other.size(), "must have same size");
--  uintptr_t* dest_map = map();
--  uintptr_t* other_map = other.map();
-+  idx_t* dest_map = map();
-+  idx_t* other_map = other.map();
-   idx_t size = size_in_words();
-   for (idx_t index = 0; index < size_in_words(); index++) {
--    uintptr_t word_union = dest_map[index] | other_map[index];
-+    idx_t word_union = dest_map[index] | other_map[index];
-     // If this has more bits set than dest_map[index], then other is not a
-     // subset.
-     if (word_union != dest_map[index]) return false;
-@@ -299,8 +299,8 @@
- 
- bool BitMap::intersects(const BitMap other) const {
-   assert(size() == other.size(), "must have same size");
--  uintptr_t* dest_map = map();
--  uintptr_t* other_map = other.map();
-+  idx_t* dest_map = map();
-+  idx_t* other_map = other.map();
-   idx_t size = size_in_words();
-   for (idx_t index = 0; index < size_in_words(); index++) {
-     if ((dest_map[index] & other_map[index]) != 0) return true;
-@@ -411,24 +411,24 @@
- }
- 
- bool BitMap::is_full() const {
--  uintptr_t* word = map();
-+  idx_t* word = map();
-   idx_t rest = size();
-   for (; rest >= (idx_t) BitsPerWord; rest -= BitsPerWord) {
--    if (*word != (uintptr_t) AllBits) return false;
-+    if (*word != (idx_t) AllBits) return false;
-     word++;
-   }
--  return rest == 0 || (*word | ~right_n_bits((int)rest)) == (uintptr_t) AllBits;
-+  return rest == 0 || (*word | ~right_n_bits((int)rest)) == (idx_t) AllBits;
- }
- 
- 
- bool BitMap::is_empty() const {
--  uintptr_t* word = map();
-+  idx_t* word = map();
-   idx_t rest = size();
-   for (; rest >= (idx_t) BitsPerWord; rest -= BitsPerWord) {
--    if (*word != (uintptr_t) NoBits) return false;
-+    if (*word != (idx_t) NoBits) return false;
-     word++;
-   }
--  return rest == 0 || (*word & right_n_bits((int)rest)) == (uintptr_t) NoBits;
-+  return rest == 0 || (*word & right_n_bits((int)rest)) == (idx_t) NoBits;
- }
- 
- void BitMap::clear_large() {
-@@ -448,7 +448,7 @@
-        offset < rightOffset && index < endIndex;
-        offset = (++index) << LogBitsPerWord) {
-     idx_t rest = map(index) >> (offset & (BitsPerWord - 1));
--    for (; offset < rightOffset && rest != (uintptr_t)NoBits; offset++) {
-+    for (; offset < rightOffset && rest != (idx_t)NoBits; offset++) {
-       if (rest & 1) {
-         blk->do_bit(offset);
-         //  resample at each closure application
-@@ -481,7 +481,7 @@
-   // check bits including and to the _left_ of offset's position
-   idx_t pos = bit_in_word(res_offset);
-   idx_t res = map(index) >> pos;
--  if (res != (uintptr_t)NoBits) {
-+  if (res != (idx_t)NoBits) {
-     // find the position of the 1-bit
-     for (; !(res & 1); res_offset++) {
-       res = res >> 1;
-@@ -492,7 +492,7 @@
-   // skip over all word length 0-bit runs
-   for (index++; index < r_index; index++) {
-     res = map(index);
--    if (res != (uintptr_t)NoBits) {
-+    if (res != (idx_t)NoBits) {
-       // found a 1, return the offset
-       for (res_offset = index << LogBitsPerWord; !(res & 1);
-            res_offset++) {
-@@ -523,7 +523,7 @@
-   idx_t pos = res_offset & (BitsPerWord - 1);
-   idx_t res = (map(index) >> pos) | left_n_bits((int)pos);
- 
--  if (res != (uintptr_t)AllBits) {
-+  if (res != (idx_t)AllBits) {
-     // find the position of the 0-bit
-     for (; res & 1; res_offset++) {
-       res = res >> 1;
-@@ -534,7 +534,7 @@
-   // skip over all word length 1-bit runs
-   for (index++; index < r_index; index++) {
-     res = map(index);
--    if (res != (uintptr_t)AllBits) {
-+    if (res != (idx_t)AllBits) {
-       // found a 0, return the offset
-       for (res_offset = index << LogBitsPerWord; res & 1;
-            res_offset++) {
-@@ -561,7 +561,7 @@
- #endif
- 
- 
--BitMap2D::BitMap2D(uintptr_t* map, idx_t size_in_slots, idx_t bits_per_slot)
-+BitMap2D::BitMap2D(idx_t* map, idx_t size_in_slots, idx_t bits_per_slot)
-   : _bits_per_slot(bits_per_slot)
-   , _map(map, size_in_slots * bits_per_slot)
- {
---- openjdk/hotspot/src/share/vm/utilities/bitMap.hpp.orig	2008-07-10 22:04:37.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/utilities/bitMap.hpp	2008-08-14 23:08:18.000000000 +0200
-@@ -35,7 +35,7 @@
- 
- 
- // Operations for bitmaps represented as arrays of unsigned 32- or 64-bit
--// integers (uintptr_t).
-+// integers (size_t).
- //
- // Bit offsets are numbered from 0 to size-1
- 
-@@ -82,7 +82,7 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/bitMap.hpp openjdk/hotspot/src/share/vm/utilities/bitMap.hpp
+--- openjdk.orig/hotspot/src/share/vm/utilities/bitMap.hpp	2008-11-06 08:40:58.000000000 +0000
++++ openjdk/hotspot/src/share/vm/utilities/bitMap.hpp	2008-11-10 00:57:20.000000000 +0000
+@@ -73,7 +73,7 @@
  
    // Set a word to a specified value or to all ones; clear a word.
-   void set_word  (idx_t word, idx_t val) { _map[word] = val; }
+   void set_word  (idx_t word, bm_word_t val) { _map[word] = val; }
 -  void set_word  (idx_t word)            { set_word(word, ~(uintptr_t)0); }
 +  void set_word  (idx_t word)            { set_word(word, ~(idx_t)0); }
    void clear_word(idx_t word)            { _map[word] = 0; }
  
    // Utilities for ranges of bits.  Ranges are half-open [beg, end).
-@@ -313,7 +313,7 @@
- 
-  public:
-   // Construction. bits_per_slot must be greater than 0.
--  BitMap2D(uintptr_t* map, idx_t size_in_slots, idx_t bits_per_slot);
-+  BitMap2D(idx_t* map, idx_t size_in_slots, idx_t bits_per_slot);
- 
-   // Allocates necessary data structure in resource area. bits_per_slot must be greater than 0.
-   BitMap2D(idx_t size_in_slots, idx_t bits_per_slot);
-@@ -366,13 +366,13 @@
- 
- 
- inline void BitMap::set_range_of_words(idx_t beg, idx_t end) {
--  uintptr_t* map = _map;
--  for (idx_t i = beg; i < end; ++i) map[i] = ~(uintptr_t)0;
-+  idx_t* map = _map;
-+  for (idx_t i = beg; i < end; ++i) map[i] = ~(idx_t)0;
- }
- 
- 
- inline void BitMap::clear_range_of_words(idx_t beg, idx_t end) {
--  uintptr_t* map = _map;
-+  idx_t* map = _map;
-   for (idx_t i = beg; i < end; ++i) map[i] = 0;
- }
- 
diff -r e61d84115155 -r 3c4aa7011748 patches/icedtea-security-updates.patch
--- a/patches/icedtea-security-updates.patch	Fri Nov 07 16:31:49 2008 -0500
+++ b/patches/icedtea-security-updates.patch	Mon Nov 10 01:38:03 2008 +0000
@@ -1,154 +1,3 @@
---- /dev/null	Mon Jun  2 08:53:52 2008
-+++ openjdk/jdk/src/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java	Mon Jun  2 08:53:51 2008
-@@ -0,0 +1,110 @@
-+/*
-+ * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.  Sun designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Sun in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+ * CA 95054 USA or visit www.sun.com if you need additional information or
-+ * have any questions.
-+ */
-+
-+package sun.management.jmxremote;
-+
-+import java.io.IOException;
-+import java.net.InetAddress;
-+import java.net.NetworkInterface;
-+import java.net.ServerSocket;
-+import java.net.Socket;
-+import java.net.SocketException;
-+import java.rmi.server.RMIServerSocketFactory;
-+import java.util.Enumeration;
-+
-+/**
-+ * This RMI server socket factory creates server sockets that
-+ * will only accept connection requests from clients running
-+ * on the host where the RMI remote objects have been exported.
-+ */
-+public final class LocalRMIServerSocketFactory implements RMIServerSocketFactory {
-+    /**
-+     * Creates a server socket that only accepts connection requests from
-+     * clients running on the host where the RMI remote objects have been
-+     * exported.
-+     */
-+    public ServerSocket createServerSocket(int port) throws IOException {
-+        return new ServerSocket(port) {
-+            @Override
-+            public Socket accept() throws IOException {
-+                Socket socket = super.accept();
-+                InetAddress remoteAddr = socket.getInetAddress();
-+                final String msg = "The server sockets created using the " +
-+                        "LocalRMIServerSocketFactory only accept connections " +
-+                        "from clients running on the host where the RMI " +
-+                        "remote objects have been exported.";
-+                // Retrieve all the network interfaces on this host.
-+                Enumeration<NetworkInterface> nis;
-+                try {
-+                    nis = NetworkInterface.getNetworkInterfaces();
-+                } catch (SocketException e) {
-+                    try {
-+                        socket.close();
-+                    } catch (IOException ioe) {
-+                        // Ignore...
-+                    }
-+                    throw new IOException(msg, e);
-+                }
-+                // Walk through the network interfaces to see
-+                // if any of them matches the client's address.
-+                // If true, then the client's address is local.
-+                while (nis.hasMoreElements()) {
-+                    NetworkInterface ni = nis.nextElement();
-+                    Enumeration<InetAddress> addrs = ni.getInetAddresses();
-+                    while (addrs.hasMoreElements()) {
-+                        InetAddress localAddr = addrs.nextElement();
-+                        if (localAddr.equals(remoteAddr)) {
-+                            return socket;
-+                        }
-+                    }
-+                }
-+                // The client's address is remote so refuse the connection.
-+                try {
-+                    socket.close();
-+                } catch (IOException ioe) {
-+                    // Ignore...
-+                }
-+                throw new IOException(msg);
-+            }
-+        };
-+    }
-+
-+    /**
-+     * Two LocalRMIServerSocketFactory objects
-+     * are equal if they are of the same type.
-+     */
-+    @Override
-+    public boolean equals(Object obj) {
-+        return (obj instanceof LocalRMIServerSocketFactory);
-+    }
-+
-+    /**
-+     * Returns a hash code value for this LocalRMIServerSocketFactory.
-+     */
-+    @Override
-+    public int hashCode() {
-+        return getClass().hashCode();
-+    }
-+}
---- old/src/share/lib/management/management.properties	Mon Jun  2 08:53:52 2008
-+++ openjdk/jdk/src/share/lib/management/management.properties	Mon Jun  2 08:53:52 2008
-@@ -82,7 +82,7 @@
- #
- # com.sun.management.snmp.interface=<InetAddress>
- #      Specifies the local interface on which the SNMP agent will bind.
--#      This is usefull when running on machines which have several
-+#      This is useful when running on machines which have several
- #      interfaces defined. It makes it possible to listen to a specific
- #      subnet accessible through that interface.
- #      Default for this property is "localhost".
-@@ -144,6 +144,26 @@
- #
- 
- #
-+# ########## RMI connector settings for local management ##########
-+#
-+# com.sun.management.jmxremote.local.only=true|false
-+#      Default for this property is true. (Case for true/false ignored)
-+#      If this property is specified as true then the local JMX RMI connector
-+#      server will only accept connection requests from clients running on
-+#      the host where the out-of-the-box JMX management agent is running.
-+#      In order to ensure backwards compatibility this property could be
-+#      set to false. However, deploying the local management agent in this
-+#      way is discouraged because the local JMX RMI connector server will
-+#      accept connection requests from any client either local or remote.
-+#      For remote management the remote JMX RMI connector server should
-+#      be used instead with authentication and SSL/TLS encryption enabled.
-+#
-+
-+# For allowing the local management agent accept local
-+# and remote connection requests use the following line
-+# com.sun.management.jmxremote.local.only=false
-+
-+#
- # ###################### RMI SSL #############################
- #
- # com.sun.management.jmxremote.ssl=true|false
 No differences encountered
 --- old/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java	Fri May 30 16:49:25 2008
 +++ openjdk/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java	Fri May 30 16:49:25 2008
@@ -905,42 +754,4 @@ No differences encountered
 +        System.out.println("Bye! Bye!");
 +    }
 +}
---- ConnectorBootstrap.java	2008-07-09 08:49:40.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java	2008-07-09 08:51:44.000000000 -0400
-@@ -98,6 +98,7 @@
- 
-         public static final String PORT = "0";
-         public static final String CONFIG_FILE_NAME = "management.properties";
-+	public static final String USE_LOCAL_ONLY="true";
-         public static final String USE_SSL = "true";
-         public static final String USE_REGISTRY_SSL = "false";
-         public static final String USE_AUTHENTICATION = "true";
-@@ -115,6 +116,8 @@
-                 "com.sun.management.jmxremote.port";
-         public static final String CONFIG_FILE_NAME =
-                 "com.sun.management.config.file";
-+	public static final String USE_LOCAL_ONLY =
-+                "com.sun.management.jmxremote.local.only";
-         public static final String USE_SSL =
-                 "com.sun.management.jmxremote.ssl";
-         public static final String USE_REGISTRY_SSL =
-@@ -477,6 +480,19 @@
-         MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
-         try {
-             JMXServiceURL url = new JMXServiceURL("rmi", localhost, 0);
-+	    // Do we accept connections from local interfaces only?
-+            Properties props = Agent.getManagementProperties();
-+            if (props ==  null) {
-+                props = new Properties();



More information about the distro-pkg-dev mailing list