Remove unused and redundant assignments
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/82725cc9 Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/82725cc9 Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/82725cc9 Branch: refs/heads/master Commit: 82725cc9defcef70c5cdca385cc994022f70cad6 Parents: 2e18dc2 Author: Matt Sicker <boa...@gmail.com> Authored: Tue Mar 13 01:15:33 2018 -0500 Committer: Matt Sicker <boa...@gmail.com> Committed: Tue Mar 13 01:15:33 2018 -0500 ---------------------------------------------------------------------- .../log4j/chainsaw/ChainsawAppenderHandler.java | 1 - .../ChainsawCyclicBufferTableModel.java | 6 ++-- .../apache/log4j/chainsaw/FileLoadAction.java | 4 +-- .../org/apache/log4j/chainsaw/LogPanel.java | 6 ++-- .../org/apache/log4j/chainsaw/NewKeyEvent.java | 2 +- .../chainsaw/layout/DefaultLayoutFactory.java | 2 +- .../log4j/chainsaw/prefs/SettingsManager.java | 2 +- .../apache/log4j/db/CustomSQLDBReceiver.java | 32 +++++++++----------- .../java/org/apache/log4j/db/DBAppender.java | 4 --- .../java/org/apache/log4j/db/DBReceiverJob.java | 23 +++++++------- .../apache/log4j/db/JNDIConnectionSource.java | 2 +- .../java/org/apache/log4j/net/JMSReceiver.java | 2 +- .../java/org/apache/log4j/net/SocketNode13.java | 2 +- .../org/apache/log4j/net/XMLSocketNode.java | 3 +- .../org/apache/log4j/net/XMLSocketReceiver.java | 1 - .../log4j/varia/LogFilePatternReceiver.java | 20 ++++++------ .../apache/log4j/xml/LogFileXMLReceiver.java | 2 +- .../java/org/apache/log4j/xml/XMLDecoder.java | 2 +- 18 files changed, 53 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java index 2259676..b4d670f 100644 --- a/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java +++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java @@ -341,7 +341,6 @@ public class ChainsawAppenderHandler extends AppenderSkeleton { listener.receiveEventBatch(identifier, eventList); } } - eventList = null; } } } http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java index 050d1c7..e659f87 100644 --- a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java +++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java @@ -64,7 +64,7 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel private static final int DEFAULT_CAPACITY = 5000; //cyclic field used internally in this class, but not exposed via the eventcontainer private boolean cyclic = true; - private int cyclicBufferSize = DEFAULT_CAPACITY; + private int cyclicBufferSize; //original list of LoggingEventWrapper instances List unfilteredList; //filtered list of LoggingEventWrapper instances @@ -834,8 +834,8 @@ fireTableRowsInserted(begin, end); logger.debug( "Changing Model, isCyclic is now " + cyclic); - List newUnfilteredList = null; - List newFilteredList = null; + List newUnfilteredList; + List newFilteredList; if (cyclic) { newUnfilteredList = new CyclicBufferList(cyclicBufferSize); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java b/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java index b89ad31..22d98ca 100644 --- a/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java +++ b/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java @@ -51,11 +51,11 @@ class FileLoadAction extends AbstractAction { * the events it loads * */ - Decoder decoder = null; + Decoder decoder; private LogUI parent; - private boolean remoteURL = false; + private boolean remoteURL; public FileLoadAction(LogUI parent, Decoder decoder, String title, boolean isRemoteURL) { http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/chainsaw/LogPanel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java index 96eb716..a7f8109 100644 --- a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java +++ b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java @@ -700,7 +700,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi if (preferenceModel.isCyclic()) { double percent = ((double) totalCount) / tableModel.getMaxSize(); - String msg = null; + String msg; boolean wasWarning = warning75 || warning100; if ((percent > 0.75) && (percent < 1.0) && !warning75) { msg = @@ -2262,7 +2262,7 @@ detailPaneUpdater.setAndUpdateSelectedRow(table.getSelectedRow()); * @see LogPanelPreferenceModel */ public void saveSettings(SaveSettingsEvent event) { - File xmlFile = null; + File xmlFile; try { xmlFile = new File(SettingsManager.getInstance().getSettingsDirectory(), URLEncoder.encode(identifier, "UTF-8") + ".xml"); } catch (UnsupportedEncodingException e) { @@ -3026,7 +3026,7 @@ detailPaneUpdater.setAndUpdateSelectedRow(table.getSelectedRow()); searchColumnNameMap.put(searchTable.getColumnName(i).toUpperCase(), searchColumnModel.getColumn(i)); } - int index = 0; + int index; StringTokenizer tok = new StringTokenizer(columnOrder, ","); List sortedColumnList = new ArrayList(); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java b/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java index 4cb5298..6c6dcce 100644 --- a/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java +++ b/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java @@ -28,7 +28,7 @@ import java.util.EventObject; * */ public class NewKeyEvent extends EventObject { - private int newModelIndex = -1; + private int newModelIndex; private Object key; private Object value; http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/chainsaw/layout/DefaultLayoutFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/chainsaw/layout/DefaultLayoutFactory.java b/src/main/java/org/apache/log4j/chainsaw/layout/DefaultLayoutFactory.java index f2eb454..5a17650 100644 --- a/src/main/java/org/apache/log4j/chainsaw/layout/DefaultLayoutFactory.java +++ b/src/main/java/org/apache/log4j/chainsaw/layout/DefaultLayoutFactory.java @@ -60,7 +60,7 @@ public class DefaultLayoutFactory { new BufferedReader( new InputStreamReader(defaultLayoutURL.openStream())); - String line = ""; + String line; while ((line = reader.readLine()) != null) { content.append(line).append("\n"); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java index 4228882..5bebe59 100644 --- a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java +++ b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java @@ -229,7 +229,7 @@ public final class SettingsManager { */ private void saveProfileableSetting(File settingsDir) { EventListener[] listeners = listenerList.getListeners(SettingsListener.class); - SaveSettingsEvent event = null; + SaveSettingsEvent event; for (EventListener listener : listeners) { SettingsListener settingsListener = (SettingsListener) listener; http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java b/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java index 5dc69ae..55ade75 100644 --- a/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java +++ b/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java @@ -288,21 +288,21 @@ public class CustomSQLDBReceiver extends Receiver implements Pauseable, Unrecogn connection = connectionSource.getConnection(); Statement statement = connection.createStatement(); - Logger eventLogger = null; - long timeStamp = 0L; - String level = null; - String threadName = null; - Object message = null; - String ndc = null; - Hashtable mdc = null; - String[] throwable = null; - String className = null; - String methodName = null; - String fileName = null; - String lineNumber = null; - Hashtable properties = null; - - String currentSQLStatement = sqlStatement; + Logger eventLogger; + long timeStamp; + String level; + String threadName; + Object message; + String ndc; + Hashtable mdc; + String[] throwable; + String className; + String methodName; + String fileName; + String lineNumber; + Hashtable properties; + + String currentSQLStatement; if (whereExists) { currentSQLStatement = sqlStatement + AND_CLAUSE + idField + " > " + lastID; @@ -424,11 +424,9 @@ public class CustomSQLDBReceiver extends Receiver implements Pauseable, Unrecogn //log when rows are retrieved if (lastID != oldLastID) { getLogger().debug("lastID: " + lastID); - oldLastID = lastID; } statement.close(); - statement = null; } catch (SQLException sqle) { getLogger() .error("*************Problem receiving events", sqle); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/db/DBAppender.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/db/DBAppender.java b/src/main/java/org/apache/log4j/db/DBAppender.java index e612a84..a9e728f 100644 --- a/src/main/java/org/apache/log4j/db/DBAppender.java +++ b/src/main/java/org/apache/log4j/db/DBAppender.java @@ -279,12 +279,10 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH // we no longer need the insertStatement if(insertStatement != null) { insertStatement.close(); - insertStatement = null; } if(idStatement != null) { idStatement.close(); - idStatement = null; } Set propertiesKeys = event.getPropertyKeySet(); @@ -314,7 +312,6 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH } insertPropertiesStatement.close(); - insertPropertiesStatement = null; } String[] strRep = event.getThrowableStrRep(); @@ -339,7 +336,6 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH insertExceptionStatement.executeBatch(); } insertExceptionStatement.close(); - insertExceptionStatement = null; } connection.commit(); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/db/DBReceiverJob.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/db/DBReceiverJob.java b/src/main/java/org/apache/log4j/db/DBReceiverJob.java index 19d3fe0..30139b4 100644 --- a/src/main/java/org/apache/log4j/db/DBReceiverJob.java +++ b/src/main/java/org/apache/log4j/db/DBReceiverJob.java @@ -73,16 +73,16 @@ class DBReceiverJob extends ComponentBase implements Job { //rs.beforeFirst(); while (rs.next()) { - Logger logger = null; - long timeStamp = 0L; - String level = null; - String threadName = null; - Object message = null; - String ndc = null; - String className = null; - String methodName = null; - String fileName = null; - String lineNumber = null; + Logger logger; + long timeStamp; + String level; + String threadName; + Object message; + String ndc; + String className; + String methodName; + String fileName; + String lineNumber; Hashtable properties = new Hashtable(); @@ -103,7 +103,7 @@ class DBReceiverJob extends ComponentBase implements Job { methodName = rs.getString(11); lineNumber = rs.getString(12).trim(); - LocationInfo locationInfo = null; + LocationInfo locationInfo; if (fileName.equals(LocationInfo.NA)) { locationInfo = LocationInfo.NA_LOCATION_INFO; } else { @@ -144,7 +144,6 @@ class DBReceiverJob extends ComponentBase implements Job { } } // while statement.close(); - statement = null; } catch (SQLException sqle) { getLogger().error("Problem receiving events", sqle); } finally { http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/db/JNDIConnectionSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/db/JNDIConnectionSource.java b/src/main/java/org/apache/log4j/db/JNDIConnectionSource.java index d2d0acd..5f972a9 100644 --- a/src/main/java/org/apache/log4j/db/JNDIConnectionSource.java +++ b/src/main/java/org/apache/log4j/db/JNDIConnectionSource.java @@ -84,7 +84,7 @@ public class JNDIConnectionSource */ public Connection getConnection() throws SQLException { - Connection conn = null; + Connection conn; try { if(dataSource == null) { http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/net/JMSReceiver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/net/JMSReceiver.java b/src/main/java/org/apache/log4j/net/JMSReceiver.java index d22e25c..1c21da9 100644 --- a/src/main/java/org/apache/log4j/net/JMSReceiver.java +++ b/src/main/java/org/apache/log4j/net/JMSReceiver.java @@ -198,7 +198,7 @@ public class JMSReceiver extends Receiver implements MessageListener { try { remoteInfo = topicFactoryName + ":" + topicName; - Context ctx = null; + Context ctx; if (jndiPath == null || jndiPath.equals("")) { ctx = new InitialContext(); } else { http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/net/SocketNode13.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/net/SocketNode13.java b/src/main/java/org/apache/log4j/net/SocketNode13.java index cc9e1d0..fb7a585 100644 --- a/src/main/java/org/apache/log4j/net/SocketNode13.java +++ b/src/main/java/org/apache/log4j/net/SocketNode13.java @@ -144,7 +144,7 @@ public class SocketNode13 extends ComponentBase implements Runnable, Pauseable { LoggingEvent event; Logger remoteLogger; Exception listenerException = null; - ObjectInputStream ois = null; + ObjectInputStream ois; try { ois = http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/net/XMLSocketNode.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/net/XMLSocketNode.java b/src/main/java/org/apache/log4j/net/XMLSocketNode.java index 09a3238..b6b0c53 100644 --- a/src/main/java/org/apache/log4j/net/XMLSocketNode.java +++ b/src/main/java/org/apache/log4j/net/XMLSocketNode.java @@ -98,10 +98,9 @@ public class XMLSocketNode extends ComponentBase implements Runnable { public void run() { Logger remoteLogger; Exception listenerException = null; - InputStream is = null; + InputStream is; if ((this.receiver == null) || (this.decoder == null)) { - is = null; listenerException = new Exception( "No receiver or decoder provided. Cannot process xml socket events"); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java index 4fcd3d0..ad60a89 100644 --- a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java +++ b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java @@ -282,7 +282,6 @@ public class XMLSocketReceiver extends Receiver implements Runnable, PortBased, XMLSocketNode node = new XMLSocketNode(decoder, socket, this); node.setLoggerRepository(this.repository); new Thread(node).start(); - socket = null; } getLogger().debug("waiting to accept socket"); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java index 34853b9..a73ab59 100644 --- a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java +++ b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java @@ -912,16 +912,16 @@ public class LogFilePatternReceiver extends Receiver { exception = emptyException; } - Logger logger = null; + Logger logger; long timeStamp = 0L; - String level = null; - String threadName = null; - Object message = null; - String ndc = null; - String className = null; - String methodName = null; - String eventFileName = null; - String lineNumber = null; + String level; + String threadName; + Object message; + String ndc; + String className; + String methodName; + String eventFileName; + String lineNumber; Hashtable properties = new Hashtable(); logger = Logger.getLogger((String) fieldMap.remove(LOGGER)); @@ -987,7 +987,7 @@ public class LogFilePatternReceiver extends Receiver { //all remaining entries in fieldmap are properties properties.putAll(fieldMap); - LocationInfo info = null; + LocationInfo info; if ((eventFileName != null) || (className != null) || (methodName != null) || (lineNumber != null)) { http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java b/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java index ab73627..c725467 100644 --- a/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java +++ b/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java @@ -239,7 +239,7 @@ public class LogFileXMLReceiver extends Receiver { BufferedReader bufferedReader = new BufferedReader(unbufferedReader); char[] content = new char[10000]; getLogger().debug("processing starting: " + fileURL); - int length = 0; + int length; do { System.out.println("in do loop-about to process"); while ((length = bufferedReader.read(content)) > -1) { http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/xml/XMLDecoder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/xml/XMLDecoder.java b/src/main/java/org/apache/log4j/xml/XMLDecoder.java index f13dea2..6395a23 100644 --- a/src/main/java/org/apache/log4j/xml/XMLDecoder.java +++ b/src/main/java/org/apache/log4j/xml/XMLDecoder.java @@ -236,7 +236,7 @@ public class XMLDecoder implements Decoder { if (document.trim().equals("")) { return null; } - String newDoc = null; + String newDoc; String newPartialEvent = null; //separate the string into the last portion ending with // </log4j:event> (which will be processed) and the
