[jboss-cvs] JBossAS SVN: r57307 - in projects/microcontainer/trunk: aop-mc-int/src/main/org/jboss/aop/microcontainer/integration aop-mc-int/src/tests/org/jboss/test/microcontainer/test container/src/main/org/jboss/annotation/factory/javassist container/src/main/org/jboss/metadata/plugins/loader/reflection container/src/main/org/jboss/metadata/spi/retrieval/cummulative container/src/main/org/jboss/reflect/plugins/introspection container/src/main/org/jboss/reflect/plugins/javassist container/src/main/org/jboss/virtual/plugins/context/file container/src/main/org/jboss/virtual/plugins/context/jar container/src/tests/org/jboss/test/classinfo/test container/src/tests/org/jboss/test/memorytests container/src/tests/org/jboss/test/virtual/support dependency/src/main/org/jboss/dependency/plugins deployers/src/main/org/jboss/deployers/spi kernel/src/main/org/jboss/beans/metadata/plugins/factory kernel/src/main/org/jboss/kernel/plugins/config kernel/src/main/org/jboss/kernel/plugins/confi! g/xml kernel/src/main/org/jboss/kernel/plugins/dependency kernel/src/main/org/jboss/kernel/plugins/registry/basic
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Sep 30 14:00:15 EDT 2006
Author: alesj
Date: 2006-09-30 13:59:17 -0400 (Sat, 30 Sep 2006)
New Revision: 57307
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCase.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeMetaDatasItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/LinkHandler.java
projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/support/AbstractMockVirtualFileHandler.java
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java
projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/IncompleteDeploymentsBuilder.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/KernelConfigFactory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/xml/JavaBeanSchemaInitializer.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/LifecycleAction.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistryFactory.java
Log:
Code cleanup - removing redundant null initializations, small code optimizations.
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -82,9 +82,8 @@
loader = Thread.currentThread().getContextClassLoader();
}
Class clazz = loader.loadClass(classInfo.getName());
- Set aspects = null;
-
- Advisor advisor = null;
+
+ Advisor advisor;
synchronized (ContainerCache.mapLock)
{
ContainerCache cache = ContainerCache.initialise(AspectManager.instance(), clazz, metaDataContext);
@@ -92,7 +91,7 @@
}
ReflectiveAspectBinder binder = new ReflectiveAspectBinder(clazz, advisor);
- aspects = binder.getAspects();
+ Set aspects = binder.getAspects();
ArrayList<Object> depends = new ArrayList<Object>();
if (aspects != null && aspects.size() > 0)
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCase.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCase.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -243,7 +243,7 @@
private void checkNotInstalledAndNotDescribed(String name)
{
- SimpleBean bean = null;
+ SimpleBean bean;
try
{
bean = (SimpleBean) getBean(name);
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCase.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCase.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -207,7 +207,7 @@
private void checkNotInstalledAndNotDescribed(String name)
{
- SimpleBean bean = null;
+ SimpleBean bean;
try
{
bean = (SimpleBean) getBean(name);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -78,12 +78,8 @@
{
Class baseType = type.getComponentType();
int size = 0;
- if (arrayMemberValue.getValue() == null || arrayMemberValue.getValue().length == 0)
+ if (arrayMemberValue.getValue() != null)
{
- size = 0;
- }
- else
- {
size = arrayMemberValue.getValue().length;
}
value = Array.newInstance(baseType, size);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -49,7 +49,7 @@
private static final ScopeKey getScopeKey(AnnotatedElement annotated)
{
- Scope scope = null;
+ Scope scope;
if (annotated instanceof Class)
{
Class clazz = (Class) annotated;
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -121,7 +121,7 @@
{
Set<AnnotationItem> temp = null;
- List<MetaDataRetrieval> retrievals = null;
+ List<MetaDataRetrieval> retrievals;
if (includeParent)
retrievals = context.getRetrievals();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeMetaDatasItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeMetaDatasItem.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeMetaDatasItem.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -120,7 +120,7 @@
{
Set<MetaDataItem> temp = null;
- List<MetaDataRetrieval> retrievals = null;
+ List<MetaDataRetrieval> retrievals;
if (includeParent)
retrievals = context.getRetrievals();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -85,7 +85,7 @@
public AnnotationValue[] getAnnotations(Object obj)
{
- Annotation[] annotations = null;
+ Annotation[] annotations;
if (obj instanceof AccessibleObject)
{
annotations = readAnnotations((AccessibleObject)obj);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -268,7 +268,7 @@
{
try
{
- Object[] annotations = null;
+ Object[] annotations;
if (obj instanceof CtMember)
{
annotations = ((CtMember)obj).getAvailableAnnotations();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/LinkHandler.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/LinkHandler.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/LinkHandler.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -123,7 +123,7 @@
String[] paths = PathTokenizer.getTokens(linkName);
int n = 0;
VirtualFileHandler linkParent = this;
- String atom = null;
+ String atom;
// Look for an existing parent
for(; n < paths.length-1; n ++)
{
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -306,7 +306,7 @@
}
public VirtualFileHandler findChild(String path) throws IOException
{
- VirtualFileHandler child = null;
+ VirtualFileHandler child;
if( isJar )
{
initNestedJar();
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -362,10 +362,10 @@
TypeInfo type = val.getType();
assertTrue(PrimitiveInfo.class.isAssignableFrom(type.getClass()));
assertTrue((type).getName().equals(name));
- Object obj = null;
+ Object obj;
try
{
- obj = type.convertValue(val.getValue());
+ obj = type.convertValue(val.getValue());
}
catch (Throwable e)
{
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -52,12 +52,10 @@
}
public void testSimpleBeanClassInfo() throws Throwable
{
- WeakReference weakReferenceOnLoader = null;
-
ClassLoader oldloader = Thread.currentThread().getContextClassLoader();
System.out.println("+++oldloader =" + oldloader.toString());
ClassLoader loader = newClassLoader(ClassInfoMemoryTestCase.class);
- weakReferenceOnLoader = new WeakReference<ClassLoader>(loader);
+ WeakReference weakReferenceOnLoader = new WeakReference<ClassLoader>(loader);
System.out.println("+++newloader =" + loader.toString());
//step1
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/support/AbstractMockVirtualFileHandler.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/support/AbstractMockVirtualFileHandler.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/support/AbstractMockVirtualFileHandler.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -87,7 +87,7 @@
{
try
{
- String uri = null;
+ String uri;
if (parent != null)
uri = parent.toURI().toString();
else
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -108,7 +108,7 @@
public boolean resolve(Controller controller)
{
boolean previous = resolved;
- ControllerContext context = null;
+ ControllerContext context;
if (dependentState == null)
context = controller.getInstalledContext(iDependOn);
Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/IncompleteDeploymentsBuilder.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/IncompleteDeploymentsBuilder.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/IncompleteDeploymentsBuilder.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -129,9 +129,9 @@
{
if (item.isResolved() == false)
{
- String dependency = null;
+ String dependency;
ControllerState actualState = null;
- String actualStateString = null;
+ String actualStateString;
Object iDependOn = item.getIDependOn();
if (iDependOn == null)
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -244,7 +244,7 @@
List<ParameterMetaData> parameters = null;
if (lifecycle != null)
parameters = lifecycle.getParameters();
- MethodJoinpoint joinpoint = null;
+ MethodJoinpoint joinpoint;
try
{
joinpoint = configurator.getMethodJoinPoint(info, cl, method, parameters, false, true);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -165,7 +165,7 @@
{
PropertyMetaData properties = getProperty("properties");
- AbstractMapMetaData map = null;
+ AbstractMapMetaData map;
if (properties == null)
{
map = new AbstractMapMetaData();
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/KernelConfigFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/KernelConfigFactory.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/KernelConfigFactory.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -66,7 +66,7 @@
* @see PropertyKernelConfig
*/
public static KernelConfig newInstance( Properties props ) {
- KernelConfig cfg = null;
+ KernelConfig cfg;
try
{
//for the values not found in the given props, default values
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/xml/JavaBeanSchemaInitializer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/xml/JavaBeanSchemaInitializer.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/xml/JavaBeanSchemaInitializer.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -160,7 +160,7 @@
Property prop = (Property) child;
String property = prop.getProperty();
- MethodInfo method = null;
+ MethodInfo method;
Object value = prop.getValue();
try
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/LifecycleAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/LifecycleAction.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/LifecycleAction.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -94,7 +94,7 @@
BeanMetaData metaData = context.getBeanMetaData();
String method = getInstallMethod(context);
List<ParameterMetaData> parameters = getInstallParameters(context);
- MethodJoinpoint joinpoint = null;
+ MethodJoinpoint joinpoint;
try
{
ClassLoader cl = Configurator.getClassLoader(metaData);
@@ -128,7 +128,7 @@
BeanMetaData metaData = context.getBeanMetaData();
String method = getUninstallMethod(context);
List<ParameterMetaData> parameters = getUninstallParameters(context);
- MethodJoinpoint joinpoint = null;
+ MethodJoinpoint joinpoint;
try
{
ClassLoader cl = Configurator.getClassLoader(metaData);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistryFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistryFactory.java 2006-09-30 17:32:29 UTC (rev 57306)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistryFactory.java 2006-09-30 17:59:17 UTC (rev 57307)
@@ -81,7 +81,7 @@
boolean trace = log.isTraceEnabled();
- KernelRegistryEntry entry = null;
+ KernelRegistryEntry entry;
synchronized (entries)
{
More information about the jboss-cvs-commits
mailing list