Author: ehillenius
Date: Thu Oct 25 11:25:33 2007
New Revision: 588303
URL: http://svn.apache.org/viewvc?rev=588303&view=rev
Log:
catch security exceptions
Modified:
wicket/trunk/jdk-1.5/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
Modified:
wicket/trunk/jdk-1.5/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java?rev=588303&r1=588302&r2=588303&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
Thu Oct 25 11:25:33 2007
@@ -61,7 +61,7 @@
/**
* List of registered names
*/
- private List<ObjectName> registered = new ArrayList<ObjectName>();
+ private final List<ObjectName> registered = new ArrayList<ObjectName>();
/**
* @see
org.apache.wicket.IDestroyer#destroy(org.apache.wicket.Application)
@@ -95,11 +95,20 @@
{
String name = application.getName();
- String agentId =
System.getProperty("wicket.mbean.server.agentid");
+ String agentId = null;
+ try
+ {
+ agentId =
System.getProperty("wicket.mbean.server.agentid");
+ }
+ catch (SecurityException e)
+ {
+ // Ignore - we're not allowed to read this
property.
+ log
+ .warn("not allowed to read
property wicket.mbean.server.agentid due to security settings; ignoring");
+ }
if (agentId != null)
{
- ArrayList<MBeanServer> mbeanServers =
(ArrayList<MBeanServer>)MBeanServerFactory
- .findMBeanServer(agentId);
+ ArrayList<MBeanServer> mbeanServers =
MBeanServerFactory.findMBeanServer(agentId);
if (!mbeanServers.isEmpty())
{
mbeanServer = mbeanServers.get(0); //
get first
@@ -111,11 +120,20 @@
}
if (mbeanServer == null)
{
- String impl =
System.getProperty("wicket.mbean.server.class");
+ String impl = null;
+ try
+ {
+
System.getProperty("wicket.mbean.server.class");
+ }
+ catch (SecurityException e)
+ {
+ // Ignore - we're not allowed to read
this property.
+ log
+ .warn("not allowed to
read property wicket.mbean.server.class due to security settings; ignoring");
+ }
if (impl != null)
{
- ArrayList<MBeanServer> mbeanServers =
(ArrayList<MBeanServer>)MBeanServerFactory
- .findMBeanServer(null);
+ ArrayList<MBeanServer> mbeanServers =
MBeanServerFactory.findMBeanServer(null);
if (!mbeanServers.isEmpty())
{
for (MBeanServer mbs :
mbeanServers)
