You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2006/02/10 21:48:35 UTC

svn commit: r376836 - in /logging/log4j/trunk/src/java/org/apache/log4j: AppenderSkeleton.java WriterAppender.java net/SocketNode.java net/SyslogAppender.java plugins/Receiver.java xml/XMLLayout.java

Author: carnold
Date: Fri Feb 10 12:48:33 2006
New Revision: 376836

URL: http://svn.apache.org/viewcvs?rev=376836&view=rev
Log:
Bug 24159: Dead variable and documentation changes

Modified:
    logging/log4j/trunk/src/java/org/apache/log4j/AppenderSkeleton.java
    logging/log4j/trunk/src/java/org/apache/log4j/WriterAppender.java
    logging/log4j/trunk/src/java/org/apache/log4j/net/SocketNode.java
    logging/log4j/trunk/src/java/org/apache/log4j/net/SyslogAppender.java
    logging/log4j/trunk/src/java/org/apache/log4j/plugins/Receiver.java
    logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java

Modified: logging/log4j/trunk/src/java/org/apache/log4j/AppenderSkeleton.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/AppenderSkeleton.java?rev=376836&r1=376835&r2=376836&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/AppenderSkeleton.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/AppenderSkeleton.java Fri Feb 10 12:48:33 2006
@@ -165,7 +165,7 @@
 
   /**
    * Return the hardcoded <code>OnlyOnceErrorHandler</code> for this Appender.
-   * <code>ErrorHandler</code>'s are no longer utilized as of version 1.3.
+   * <code>ErrorHandler</code>s are no longer utilized as of version 1.3.
    *
    * @since 0.9.0
    * @deprecated As of 1.3
@@ -199,7 +199,7 @@
   }
 
   /**
-   * Returns the name of this FileAppender.
+   * Returns the name of this appender.
    */
   public final String getName() {
     return this.name;

Modified: logging/log4j/trunk/src/java/org/apache/log4j/WriterAppender.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/WriterAppender.java?rev=376836&r1=376835&r2=376836&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/WriterAppender.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/WriterAppender.java Fri Feb 10 12:48:33 2006
@@ -24,7 +24,6 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import org.apache.log4j.helpers.QuietWriter;
-import org.apache.log4j.helpers.LogLog;
 
 // Contibutors: Jens Uwe Pipka <je...@gmx.de>
 //              Ben Sandee

Modified: logging/log4j/trunk/src/java/org/apache/log4j/net/SocketNode.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/net/SocketNode.java?rev=376836&r1=376835&r2=376836&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/net/SocketNode.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/net/SocketNode.java Fri Feb 10 12:48:33 2006
@@ -53,7 +53,6 @@
   private boolean paused;
   private Socket socket;
   private Receiver receiver;
-  private SocketNodeEventListener listener;
   private List listenerList = Collections.synchronizedList(new ArrayList());
 
   /**
@@ -186,7 +185,7 @@
     }
 
     // send event to listener, if configured
-    if (listener != null || listenerList.size()>0) {
+    if (listenerList.size()>0) {
       fireSocketClosedEvent(listenerException);
     }
   }

Modified: logging/log4j/trunk/src/java/org/apache/log4j/net/SyslogAppender.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/net/SyslogAppender.java?rev=376836&r1=376835&r2=376836&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/net/SyslogAppender.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/net/SyslogAppender.java Fri Feb 10 12:48:33 2006
@@ -30,7 +30,6 @@
 import java.text.FieldPosition;
 import java.text.SimpleDateFormat;
 
-import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
@@ -128,7 +127,6 @@
 
   //SyslogTracerPrintWriter stp;
   private SyslogWriter sw;
-  private final Calendar calendar = Calendar.getInstance();
   private long now = -1;
   private Date date = new Date();
   private StringBuffer timestamp = new StringBuffer();

Modified: logging/log4j/trunk/src/java/org/apache/log4j/plugins/Receiver.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/plugins/Receiver.java?rev=376836&r1=376835&r2=376836&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/plugins/Receiver.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/plugins/Receiver.java Fri Feb 10 12:48:33 2006
@@ -59,11 +59,6 @@
 public abstract class Receiver extends PluginSkeleton implements Thresholdable {
 	protected Level thresholdLevel;
   
-  /*
-   * An instance specific logger which must be accessed through the getLogger()
-   * method. 
-   */
-  private Logger logger;
   
   
   

Modified: logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java?rev=376836&r1=376835&r2=376836&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java Fri Feb 10 12:48:33 2006
@@ -205,10 +205,11 @@
 
       while (propIter.hasNext()) {
         String propName = propIter.next().toString();
-        buf.append("    <log4j:data name=\"" + propName);
+        buf.append("    <log4j:data name=\"");
+        buf.append(propName);
 
-        String propValue = event.getProperty(propName).toString();
-        buf.append("\" value=\"" + propValue);
+        buf.append("\" value=\"");
+        buf.append(event.getProperty(propName));
         buf.append("\"/>\r\n");
       }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org