logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1435569 - in /logging/log4j/log4j2/trunk: flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/ log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/ slf4j-impl/src/main/java/org/slf4j/impl/ web/src/main/java/org/apache/logging/...
Date Sat, 19 Jan 2013 15:03:31 GMT
Author: rgoers
Date: Sat Jan 19 15:03:30 2013
New Revision: 1435569

URL: http://svn.apache.org/viewvc?rev=1435569&view=rev
Log:
Fix some of the checkstyle errors that have recently been introduced.

Modified:
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Log4jEventSource.java
    logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
    logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java
    logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/SLF4JLogger.java
    logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java?rev=1435569&r1=1435568&r2=1435569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
(original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
Sat Jan 19 15:03:30 2013
@@ -97,8 +97,9 @@ public final class FlumeAppender extends
      * @param compress If true the body will be compressed.
      * @return A Flume Event.
      */
-    public FlumeEvent createEvent(final LogEvent event, final String includes, final String
excludes, final String required,
-                      final String mdcPrefix, final String eventPrefix, final boolean compress)
{
+    public FlumeEvent createEvent(final LogEvent event, final String includes, final String
excludes,
+                                  final String required, final String mdcPrefix, final String
eventPrefix,
+                                  final boolean compress) {
         return new FlumeEvent(event, mdcIncludes, mdcExcludes, mdcRequired, mdcPrefix,
             eventPrefix, compressBody);
     }
@@ -106,6 +107,9 @@ public final class FlumeAppender extends
     /**
      * Create a Flume Avro Appender.
      * @param agents An array of Agents.
+     * @param properties Properties to pass to the embedded agent.
+     * @param embedded true if the embedded agent manager should be used. otherwise the Avro
mangaer will be used.
+     * @param dataDir The directory where the Flume FileChannel should write its data.
      * @param delay The amount of time in milliseconds to wait between retries.
      * @param agentRetries The number of times to retry an agent before failing to the next
agent.
      * @param name The name of the Appender.

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java?rev=1435569&r1=1435568&r2=1435569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
(original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
Sat Jan 19 15:03:30 2013
@@ -75,6 +75,7 @@ public class FlumeAvroManager extends Ab
 
     /**
      * Returns a FlumeAvroManager.
+     * @param name The name of the manager.
      * @param agents The agents to use.
      * @param batchSize The number of events to include in a batch.
      * @return A FlumeAvroManager.

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java?rev=1435569&r1=1435568&r2=1435569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java
(original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java
Sat Jan 19 15:03:30 2013
@@ -70,7 +70,8 @@ public class FlumeConfigurationBuilder {
     private final SourceFactory sourceFactory = new DefaultSourceFactory();
     private final SinkFactory sinkFactory = new DefaultSinkFactory();
 
-    public NodeConfiguration load(final String name, final Properties props, final NodeConfigurationAware
configurationAware) {
+    public NodeConfiguration load(final String name, final Properties props,
+                                  final NodeConfigurationAware configurationAware) {
         final NodeConfiguration conf = new SimpleNodeConfiguration();
         FlumeConfiguration fconfig;
         try {
@@ -141,7 +142,8 @@ public class FlumeConfigurationBuilder {
         for (final String ch : channels) {
             final Context context = agentConf.getChannelContext().get(ch);
             if (context != null) {
-                final Channel channel = channelFactory.create(ch, context.getString(BasicConfigurationConstants.CONFIG_TYPE));
+                final Channel channel = channelFactory.create(ch,
+                    context.getString(BasicConfigurationConstants.CONFIG_TYPE));
                 Configurables.configure(channel, context);
                 conf.getChannels().put(ch, channel);
                 LOGGER.info("created channel " + ch);
@@ -182,11 +184,13 @@ public class FlumeConfigurationBuilder {
 
         for (final String src : sources) {
             final Context context = sourceContexts.get(src);
-            if (context != null){
-                final Source source = sourceFactory.create(src, context.getString(BasicConfigurationConstants.CONFIG_TYPE));
+            if (context != null) {
+                final Source source = sourceFactory.create(src,
+                    context.getString(BasicConfigurationConstants.CONFIG_TYPE));
                 final List<Channel> channels = new ArrayList<Channel>();
                 Configurables.configure(source, context);
-                final String[] channelNames = context.getString(BasicConfigurationConstants.CONFIG_CHANNELS).split("\\s+");
+                final String[] channelNames =
+                    context.getString(BasicConfigurationConstants.CONFIG_CHANNELS).split("\\s+");
                 for (final String chName : channelNames) {
                     channels.add(conf.getChannels().get(chName));
                 }
@@ -226,7 +230,8 @@ public class FlumeConfigurationBuilder {
         for (final String sinkName : sinkNames) {
             final Context context = sinkContexts.get(sinkName);
             if (context != null) {
-                final Sink sink = sinkFactory.create(sinkName, context.getString(BasicConfigurationConstants.CONFIG_TYPE));
+                final Sink sink = sinkFactory.create(sinkName,
+                    context.getString(BasicConfigurationConstants.CONFIG_TYPE));
                 Configurables.configure(sink, context);
 
                 sink.setChannel(conf.getChannels().get(context.getString(BasicConfigurationConstants.CONFIG_CHANNEL)));

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java?rev=1435569&r1=1435568&r2=1435569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
(original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
Sat Jan 19 15:03:30 2013
@@ -35,14 +35,15 @@ import java.util.Properties;
  */
 public class FlumeEmbeddedManager extends AbstractFlumeManager {
 
+    /** Name for the Flume source */
+    protected static final String SOURCE_NAME = "log4j-source";
+
     private static ManagerFactory factory = new FlumeManagerFactory();
 
     private final FlumeNode node;
 
     private NodeConfiguration conf;
 
-    protected static final String SOURCE_NAME = "log4j-source";
-
     private final Log4jEventSource source;
 
     private final String shortName;
@@ -66,12 +67,15 @@ public class FlumeEmbeddedManager extend
 
     /**
      * Returns a FlumeEmbeddedManager.
+     * @param name The name of the manager.
      * @param agents The agents to use.
+     * @param properties Properties for the embedded manager.
      * @param batchSize The number of events to include in a batch.
+     * @param dataDir The directory where the Flume FileChannel should write to.
      * @return A FlumeAvroManager.
      */
-    public static FlumeEmbeddedManager getManager(final String name, final Agent[] agents,
final Property[] properties, int batchSize,
-                                                  final String dataDir) {
+    public static FlumeEmbeddedManager getManager(final String name, final Agent[] agents,
final Property[] properties,
+                                                  int batchSize, final String dataDir) {
 
         if (batchSize <= 0) {
             batchSize = 1;
@@ -139,7 +143,8 @@ public class FlumeEmbeddedManager extend
          * @param batchSize The number of events to include in a batch.
          * @param dataDir The directory where Flume should write to.
          */
-        public FactoryData(final String name, final Agent[] agents, final Property[] properties,
final int batchSize, final String dataDir) {
+        public FactoryData(final String name, final Agent[] agents, final Property[] properties,
final int batchSize,
+                           final String dataDir) {
             this.name = name;
             this.agents = agents;
             this.batchSize = batchSize;
@@ -152,7 +157,7 @@ public class FlumeEmbeddedManager extend
      * Avro Manager Factory.
      */
     private static class FlumeManagerFactory implements ManagerFactory<FlumeEmbeddedManager,
FactoryData> {
-        private static final String sourceType = Log4jEventSource.class.getName();
+        private static final String SOURCE_TYPE = Log4jEventSource.class.getName();
 
         /**
          * Create the FlumeAvroManager.
@@ -180,8 +185,8 @@ public class FlumeEmbeddedManager extend
             return null;
         }
 
-        private Properties createProperties(final String name, final Agent[] agents, final
Property[] properties, final int batchSize,
-                                            String dataDir) {
+        private Properties createProperties(final String name, final Agent[] agents, final
Property[] properties,
+                                            final int batchSize, String dataDir) {
             final Properties props = new Properties();
 
             if ((agents == null || agents.length == 0) && (properties == null ||
properties.length == 0)) {
@@ -196,7 +201,7 @@ public class FlumeEmbeddedManager extend
 
             if (agents != null && agents.length > 0) {
                 props.put(name + ".sources", FlumeEmbeddedManager.SOURCE_NAME);
-                props.put(name + ".sources." + FlumeEmbeddedManager.SOURCE_NAME + ".type",
sourceType);
+                props.put(name + ".sources." + FlumeEmbeddedManager.SOURCE_NAME + ".type",
SOURCE_TYPE);
                 props.put(name + ".channels", "file");
                 props.put(name + ".channels.file.type", "file");
                 if (dataDir != null && dataDir.length() > 0) {
@@ -211,7 +216,7 @@ public class FlumeEmbeddedManager extend
                 final StringBuilder sb = new StringBuilder();
                 String leading = "";
                 int priority = agents.length;
-                for (int i=0; i < agents.length; ++i) {
+                for (int i = 0; i < agents.length; ++i) {
                     sb.append(leading).append("agent").append(i);
                     leading = " ";
                     final String prefix = name + ".sinks.agent" + i;
@@ -235,7 +240,7 @@ public class FlumeEmbeddedManager extend
                 String[] sinks = null;
 
                 props.put(name + ".sources", FlumeEmbeddedManager.SOURCE_NAME);
-                props.put(name + ".sources." + FlumeEmbeddedManager.SOURCE_NAME + ".type",
sourceType);
+                props.put(name + ".sources." + FlumeEmbeddedManager.SOURCE_NAME + ".type",
SOURCE_TYPE);
 
                 for (final Property property : properties) {
                     final String key = property.getName();
@@ -249,7 +254,8 @@ public class FlumeEmbeddedManager extend
                     final String upperKey = key.toUpperCase(Locale.ENGLISH);
 
                     if (upperKey.startsWith(name.toUpperCase(Locale.ENGLISH))) {
-                        final String msg = "Specification of the agent name is allowed in
Flume Appender configuration: " + key;
+                        final String msg =
+                            "Specification of the agent name is allowed in Flume Appender
configuration: " + key;
                         LOGGER.error(msg);
                         throw new ConfigurationException(msg);
                     }

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java?rev=1435569&r1=1435568&r2=1435569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
(original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
Sat Jan 19 15:03:30 2013
@@ -138,7 +138,8 @@ public class FlumeEvent extends SimpleEv
         addGuid(headers);
     }
 
-    protected void addStructuredData(final String prefix, final Map<String, String>
fields, final StructuredDataMessage msg) {
+    protected void addStructuredData(final String prefix, final Map<String, String>
fields,
+                                     final StructuredDataMessage msg) {
         fields.put(prefix + EVENT_TYPE, msg.getType());
         final StructuredDataId id = msg.getId();
         fields.put(prefix + EVENT_ID, id.getName());
@@ -151,7 +152,8 @@ public class FlumeEvent extends SimpleEv
         }
     }
 
-    protected void addContextData(final String prefix, final Map<String, String> fields,
final Map<String, String> context) {
+    protected void addContextData(final String prefix, final Map<String, String> fields,
+                                  final Map<String, String> context) {
         for (final Map.Entry<String, String> entry : context.entrySet()) {
             if (entry.getKey() != null && entry.getValue() != null) {
                 fields.put(prefix + entry.getKey(), entry.getValue());

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java?rev=1435569&r1=1435568&r2=1435569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java
(original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java
Sat Jan 19 15:03:30 2013
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
  */
 public class FlumeNode implements LifecycleAware {
 
-    private static final Logger logger = LoggerFactory.getLogger(FlumeNode.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FlumeNode.class);
 
     private LifecycleState lifecycleState;
     private final NodeManager nodeManager;
@@ -39,18 +39,17 @@ public class FlumeNode implements Lifecy
 
     public FlumeNode(final NodeManager manager, final NodeConfiguration conf) {
         this.nodeManager = manager;
-        this.conf =conf;
+        this.conf = conf;
         supervisor = new LifecycleSupervisor();
     }
 
     public void start() {
 
-        Preconditions.checkState(nodeManager != null,
-            "Node manager can not be null");
+        Preconditions.checkState(nodeManager != null, "Node manager can not be null");
 
         supervisor.start();
 
-        logger.info("Flume node starting");
+        LOGGER.info("Flume node starting");
 
         supervisor.supervise(nodeManager,
             new LifecycleSupervisor.SupervisorPolicy.AlwaysRestartPolicy(), LifecycleState.START);
@@ -60,7 +59,7 @@ public class FlumeNode implements Lifecy
 
     public void stop() {
 
-        logger.info("Flume node stopping");
+        LOGGER.info("Flume node stopping");
 
         supervisor.stop();
 

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Log4jEventSource.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Log4jEventSource.java?rev=1435569&r1=1435568&r2=1435569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Log4jEventSource.java
(original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Log4jEventSource.java
Sat Jan 19 15:03:30 2013
@@ -28,9 +28,9 @@ import org.slf4j.Logger;
  */
 public class Log4jEventSource extends AbstractSource implements EventDrivenSource {
 
-    private final SourceCounter sourceCounter = new SourceCounter("log4j");
+    private static final Logger LOGGER = LoggerFactory.getLogger(Log4jEventSource.class);
 
-    private static final Logger logger = LoggerFactory.getLogger(Log4jEventSource.class);
+    private final SourceCounter sourceCounter = new SourceCounter("log4j");
 
     public Log4jEventSource() {
         setName("Log4jEvent");
@@ -40,14 +40,14 @@ public class Log4jEventSource extends Ab
     public synchronized void start() {
         super.start();
 
-        logger.info("Log4j Source started");
+        LOGGER.info("Log4j Source started");
     }
 
     @Override
     public synchronized void stop() {
         super.stop();
 
-        logger.info("Log4j Source stopped. Metrics {}", sourceCounter);
+        LOGGER.info("Log4j Source stopped. Metrics {}", sourceCounter);
     }
 
 
@@ -57,7 +57,7 @@ public class Log4jEventSource extends Ab
         try {
             getChannelProcessor().processEvent(event);
         } catch (final ChannelException ex) {
-            logger.warn("Unabled to process event {}" + event, ex);
+            LOGGER.warn("Unabled to process event {}" + event, ex);
             throw ex;
         }
         sourceCounter.incrementAppendAcceptedCount();

Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java?rev=1435569&r1=1435568&r2=1435569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
(original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
Sat Jan 19 15:03:30 2013
@@ -46,7 +46,8 @@ public class SLF4JLogger extends Abstrac
     }
 
     @Override
-    protected void log(final Marker marker, final String fqcn, final Level level, final Message
data, final Throwable t) {
+    protected void log(final Marker marker, final String fqcn, final Level level, final Message
data,
+                       final Throwable t) {
         if (locationAwareLogger != null) {
             if (data instanceof LoggerNameAwareMessage) {
                 ((LoggerNameAwareMessage) data).setLoggerName(getName());
@@ -57,16 +58,22 @@ public class SLF4JLogger extends Abstrac
             switch (level) {
                 case DEBUG :
                     logger.debug(getMarker(marker), data.getFormattedMessage(), data.getParameters(),
t);
+                    break;
                 case TRACE :
                     logger.trace(getMarker(marker), data.getFormattedMessage(), data.getParameters(),
t);
+                    break;
                 case INFO :
                     logger.info(getMarker(marker), data.getFormattedMessage(), data.getParameters(),
t);
+                    break;
                 case WARN :
                     logger.warn(getMarker(marker), data.getFormattedMessage(), data.getParameters(),
t);
+                    break;
                 case ERROR :
                     logger.error(getMarker(marker), data.getFormattedMessage(), data.getParameters(),
t);
+                    break;
                 default :
                     logger.error(getMarker(marker), data.getFormattedMessage(), data.getParameters(),
t);
+                    break;
             }
         }
     }

Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java?rev=1435569&r1=1435568&r2=1435569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java
(original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java
Sat Jan 19 15:03:30 2013
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.spi.Logg
 public class SLF4JLoggerContextFactory implements LoggerContextFactory {
     private static LoggerContext context = new SLF4JLoggerContext();
 
-    public LoggerContext getContext(final String FQCN, final ClassLoader loader, final boolean
currentContext) {
+    public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean
currentContext) {
         return context;
     }
 }

Modified: logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/SLF4JLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/SLF4JLogger.java?rev=1435569&r1=1435568&r2=1435569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/SLF4JLogger.java (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/SLF4JLogger.java Sat
Jan 19 15:03:30 2013
@@ -421,7 +421,8 @@ public class SLF4JLogger implements Loca
     }
 
 
-    public void log(final Marker marker, final String fqcn, final int i, final String s1,
final Object[] objects, Throwable throwable) {
+    public void log(final Marker marker, final String fqcn, final int i, final String s1,
final Object[] objects,
+                    Throwable throwable) {
         if (!logger.isEnabled(getLevel(i), (org.apache.logging.log4j.Marker) marker, s1))
{
             return;
         }

Modified: logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java?rev=1435569&r1=1435568&r2=1435569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java
(original)
+++ logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java
Sat Jan 19 15:03:30 2013
@@ -78,7 +78,8 @@ public class JNDIContextFilter implement
         }
     }
 
-    public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse,
final FilterChain filterChain)
+    public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse,
+                         final FilterChain filterChain)
         throws IOException, ServletException {
         final LoggerContext ctx = (LoggerContext) context.getAttribute(Log4jContextListener.LOG4J_CONTEXT_ATTRIBUTE);
         if (ctx != null) {



Mime
View raw message