[jboss-cvs] JBossAS SVN: r91794 - projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata.

[jboss-cvs-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-07-29 19:54:42 -0400 (Wed, 29 Jul 2009)
New Revision: 91794

Modified:
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaDataHelper.java
Log:
Fix an NPE when nontrivial filters are used

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaDataHelper.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaDataHelper.java	2009-07-29 22:14:15 UTC (rev 91793)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaDataHelper.java	2009-07-29 23:54:42 UTC (rev 91794)
@@ -306,8 +306,7 @@
             throw new NullPointerException("name is null");
         }
         final AbstractValueFactoryMetaData avfmd = new AbstractValueFactoryMetaData(getContextName(context), "getLevelForName");
-//        avfmd.setBean(Level.class.getName());
-        avfmd.setBean(getContextName(context));
+        avfmd.setBean(Level.class.getName());
         final List<ParameterMetaData> parameterList = new ArrayList<ParameterMetaData>(1);
         avfmd.setParameters(parameterList);
         parameterList.add(new AbstractParameterMetaData(String.class.getName(), name));
@@ -333,7 +332,7 @@
         final String name = filterMetaData.getName();
         final String beanName = name == null ? getAnonymousName(context, Kind.FILTER) : getName(context, Kind.FILTER, name);
         final Object value = filterMetaData.getValue();
-        return getFilterValue(beanName, null, value);
+        return getFilterValue(beanName, context, value);
     }
 
     private static ValueMetaData getFilterValue(final String beanName, final String context, final Object value) {
@@ -351,7 +350,7 @@
             }
             final List<ValueMetaData> filterList = builder.createArray();
             for (Object filterValue : metaData.getFilterMetaDataList()) {
-                filterList.add(getFilterValue(getAnonymousName(context, Kind.FILTER), null, filterValue));
+                filterList.add(getFilterValue(getAnonymousName(context, Kind.FILTER), context, filterValue));
             }
             builder.addConstructorParameter(Filter[].class.getName(), (ValueMetaData) filterList);
             return builder.getBeanMetaData();