Revision: 15677
Author: emmartins
Date: Wed Dec 8 06:29:28 2010
Log: Fixes Issue 2198
http://code.google.com/p/mobicents/source/detail?r=15677
Modified:
/trunk/servers/jain-slee/core/common/src/main/java/org/mobicents/slee/container/management/jmx/AlarmMBeanImpl.java
/trunk/servers/jain-slee/core/common/src/main/java/org/mobicents/slee/runtime/facilities/TraceFacilityImpl.java
/trunk/servers/jain-slee/core/common/src/test/java/org/mobicents/slee/runtime/facilities/TracerFrameworkTest.java
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/EventTypeComponentImpl.java
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/security/PolicyFileImpl.java
/trunk/servers/jain-slee/core/components/components/src/test/java/org/mobicents/slee/container/component/validator/SbbComponentValidatorSbbEventsTest.java
/trunk/servers/jain-slee/core/profiles/src/main/java/org/mobicents/slee/container/profile/ProfileTableTransactionView.java
/trunk/servers/jain-slee/core/services/src/main/java/org/mobicents/slee/runtime/sbb/SbbObjectPoolManagementImpl.java
/trunk/servers/jain-slee/core/usage/src/main/java/org/mobicents/slee/container/management/jmx/ServiceUsageMBeanImpl.java
/trunk/servers/jain-slee/core/usage/src/main/java/org/mobicents/slee/container/management/jmx/UsageMBeanImpl.java
=======================================
---
/trunk/servers/jain-slee/core/common/src/main/java/org/mobicents/slee/container/management/jmx/AlarmMBeanImpl.java
Mon Apr 26 08:37:10 2010
+++
/trunk/servers/jain-slee/core/common/src/main/java/org/mobicents/slee/container/management/jmx/AlarmMBeanImpl.java
Wed Dec 8 06:29:28 2010
@@ -472,7 +472,7 @@
*
* @author Tim
*/
- class RegisteredComp {
+ static class RegisteredComp {
public AtomicLong seqNo = new AtomicLong(0);
public long getSeqNo() {
=======================================
---
/trunk/servers/jain-slee/core/common/src/main/java/org/mobicents/slee/runtime/facilities/TraceFacilityImpl.java
Mon Apr 26 08:37:10 2010
+++
/trunk/servers/jain-slee/core/common/src/main/java/org/mobicents/slee/runtime/facilities/TraceFacilityImpl.java
Wed Dec 8 06:29:28 2010
@@ -58,7 +58,7 @@
+ "\n" + traceMBeanImpl;
}
- class MTraceLevel {
+ static class MTraceLevel {
private Level level;
private int seqno;
=======================================
---
/trunk/servers/jain-slee/core/common/src/test/java/org/mobicents/slee/runtime/facilities/TracerFrameworkTest.java
Mon Sep 13 15:23:11 2010
+++
/trunk/servers/jain-slee/core/common/src/test/java/org/mobicents/slee/runtime/facilities/TracerFrameworkTest.java
Wed Dec 8 06:29:28 2010
@@ -289,7 +289,7 @@
}
}
- private class FakeTraceMBeanImpl extends TraceMBeanImpl {
+ private static class FakeTraceMBeanImpl extends TraceMBeanImpl {
public FakeTraceMBeanImpl() throws NotCompliantMBeanException {
super(null);
=======================================
---
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/EventTypeComponentImpl.java
Mon Apr 26 08:37:10 2010
+++
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/EventTypeComponentImpl.java
Wed Dec 8 06:29:28 2010
@@ -54,7 +54,7 @@
*/
private SortedSet<ServiceComponent>
activeServicesWhichDefineEventAsInitial = new TreeSet<ServiceComponent>(new
ActiveServicesWhichDefineEventAsInitialComparator());
- private class ActiveServicesWhichDefineEventAsInitialComparator
implements Comparator<ServiceComponent> {
+ private static class ActiveServicesWhichDefineEventAsInitialComparator
implements Comparator<ServiceComponent> {
public int compare(ServiceComponent o1, ServiceComponent o2) {
if (o1 == o2) {
return 0;
=======================================
---
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/security/PolicyFileImpl.java
Mon Apr 26 08:37:10 2010
+++
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/security/PolicyFileImpl.java
Wed Dec 8 06:29:28 2010
@@ -696,7 +696,7 @@
* </a>
* @author <a href="mailto:[email protected]";> Alexandre Mendonca </a>
*/
- private class GlobalPolicyHolder {
+ private static class GlobalPolicyHolder {
private final List<PolicyHolderEntry> policyHolderEntries = new
ArrayList<PolicyHolderEntry>();
private final Map<ProtectionDomain, PermissionCollection>
protectionDomain2PermissionCollection = new HashMap<ProtectionDomain,
PermissionCollection>();
private final Set<String> loadedFiles = new HashSet<String>();
@@ -711,7 +711,7 @@
}
- private class ImpliesAction implements PrivilegedExceptionAction {
+ private static class ImpliesAction implements PrivilegedExceptionAction
{
private CodeSource cs;
private PolicyHolderEntry phe;
=======================================
---
/trunk/servers/jain-slee/core/components/components/src/test/java/org/mobicents/slee/container/component/validator/SbbComponentValidatorSbbEventsTest.java
Mon Apr 26 08:37:10 2010
+++
/trunk/servers/jain-slee/core/components/components/src/test/java/org/mobicents/slee/container/component/validator/SbbComponentValidatorSbbEventsTest.java
Wed Dec 8 06:29:28 2010
@@ -368,7 +368,7 @@
}
- private class XComponentRepository implements ComponentRepository {
+ private static class XComponentRepository implements
ComponentRepository {
public SbbComponent getComponentByID(SbbID id) {
return null;
=======================================
---
/trunk/servers/jain-slee/core/profiles/src/main/java/org/mobicents/slee/container/profile/ProfileTableTransactionView.java
Mon Apr 26 08:37:10 2010
+++
/trunk/servers/jain-slee/core/profiles/src/main/java/org/mobicents/slee/container/profile/ProfileTableTransactionView.java
Wed Dec 8 06:29:28 2010
@@ -179,7 +179,7 @@
* @author martins
*
*/
- private class ProfileTransactionID {
+ private static class ProfileTransactionID {
private final String profileName;
private final String profileTableName;
=======================================
---
/trunk/servers/jain-slee/core/services/src/main/java/org/mobicents/slee/runtime/sbb/SbbObjectPoolManagementImpl.java
Mon May 10 08:09:11 2010
+++
/trunk/servers/jain-slee/core/services/src/main/java/org/mobicents/slee/runtime/sbb/SbbObjectPoolManagementImpl.java
Wed Dec 8 06:29:28 2010
@@ -317,7 +317,7 @@
return "SbbObject Pool Management: " + "\n+-- Pools: " +
pools.keySet();
}
- private class ObjectPoolMapKey {
+ private static class ObjectPoolMapKey {
private final ServiceID serviceID;
private final SbbID sbbID;
=======================================
---
/trunk/servers/jain-slee/core/usage/src/main/java/org/mobicents/slee/container/management/jmx/ServiceUsageMBeanImpl.java
Mon Apr 26 08:37:10 2010
+++
/trunk/servers/jain-slee/core/usage/src/main/java/org/mobicents/slee/container/management/jmx/ServiceUsageMBeanImpl.java
Wed Dec 8 06:29:28 2010
@@ -907,7 +907,7 @@
}
}
- public class SbbUsageMBeanMapKey {
+ public static class SbbUsageMBeanMapKey {
private final SbbID sbbID;
private final String paramName;
=======================================
---
/trunk/servers/jain-slee/core/usage/src/main/java/org/mobicents/slee/container/management/jmx/UsageMBeanImpl.java
Mon Apr 26 08:37:10 2010
+++
/trunk/servers/jain-slee/core/usage/src/main/java/org/mobicents/slee/container/management/jmx/UsageMBeanImpl.java
Wed Dec 8 06:29:28 2010
@@ -188,7 +188,7 @@
seqno, System.currentTimeMillis());
}
- class ListenerFilterHandbackTriplet {
+ static class ListenerFilterHandbackTriplet {
NotificationListener notificationListener;
