You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/06/25 18:51:27 UTC
svn commit: r1605496 - in /logging/log4j/log4j2/trunk:
log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/
log4j-core/src/main/java/org/apache/logging/log4...
Author: ggregory
Date: Wed Jun 25 16:51:26 2014
New Revision: 1605496
URL: http://svn.apache.org/r1605496
Log:
[LOG4J2-687] Rename org.apache.logging.log4j.core.util.Closer.closeSilent() to closeSilently().
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Closer.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/AvailablePortFinder.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/core/net/FreePortFinder.java
logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java
logging/log4j/log4j2/trunk/src/changes/changes.xml
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java?rev=1605496&r1=1605495&r2=1605496&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java Wed Jun 25 16:51:26 2014
@@ -117,7 +117,7 @@ public final class JdbcDatabaseManager e
throw new AppenderLoggingException("Failed to insert record for log event in JDBC manager: " +
e.getMessage(), e);
} finally {
- Closer.closeSilent(reader);
+ Closer.closeSilently(reader);
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java?rev=1605496&r1=1605495&r2=1605496&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java Wed Jun 25 16:51:26 2014
@@ -177,7 +177,7 @@ public class PluginManager {
} catch (final IOException ex) {
LOGGER.warn("Unable to preload plugins", ex);
} finally {
- Closer.closeSilent(dis);
+ Closer.closeSilently(dis);
}
}
return map.isEmpty() ? null : map;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java?rev=1605496&r1=1605495&r2=1605496&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java Wed Jun 25 16:51:26 2014
@@ -184,8 +184,8 @@ public class LoggerContextAdmin extends
}
return result.toString();
} finally {
- Closer.closeSilent(in);
- Closer.closeSilent(reader);
+ Closer.closeSilently(in);
+ Closer.closeSilently(reader);
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java?rev=1605496&r1=1605495&r2=1605496&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java Wed Jun 25 16:51:26 2014
@@ -62,7 +62,7 @@ public class JndiLookup implements StrLo
} catch (final NamingException e) {
return null;
} finally {
- Closer.closeSilent(ctx);
+ Closer.closeSilently(ctx);
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java?rev=1605496&r1=1605495&r2=1605496&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java Wed Jun 25 16:51:26 2014
@@ -118,7 +118,7 @@ public class JndiContextSelector impleme
} catch (final NamingException ne) {
LOGGER.error("Unable to lookup " + Constants.JNDI_CONTEXT_NAME, ne);
} finally {
- Closer.closeSilent(ctx);
+ Closer.closeSilently(ctx);
}
return loggingContextName == null ? CONTEXT : locateContext(loggingContextName, null, configLocation);
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Closer.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Closer.java?rev=1605496&r1=1605495&r2=1605496&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Closer.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Closer.java Wed Jun 25 16:51:26 2014
@@ -42,7 +42,7 @@ public final class Closer {
*
* @param closeable the resource to close, may be {@code null}
*/
- public static void closeSilent(final Closeable closeable) {
+ public static void closeSilently(final Closeable closeable) {
try {
if (closeable != null) {
closeable.close();
@@ -69,7 +69,7 @@ public final class Closer {
*
* @param serverSocket the resource to close, may be {@code null}
*/
- public static void closeSilent(final ServerSocket serverSocket) {
+ public static void closeSilently(final ServerSocket serverSocket) {
try {
if (serverSocket != null) {
serverSocket.close();
@@ -96,7 +96,7 @@ public final class Closer {
*
* @param datagramSocket the resource to close, may be {@code null}
*/
- public static void closeSilent(final DatagramSocket datagramSocket) {
+ public static void closeSilently(final DatagramSocket datagramSocket) {
try {
if (datagramSocket != null) {
datagramSocket.close();
@@ -124,7 +124,7 @@ public final class Closer {
*
* @param statement the resource to close, may be {@code null}
*/
- public static void closeSilent(final Statement statement) {
+ public static void closeSilently(final Statement statement) {
try {
if (statement != null) {
statement.close();
@@ -152,7 +152,7 @@ public final class Closer {
*
* @param connection the resource to close, may be {@code null}
*/
- public static void closeSilent(final Connection connection) {
+ public static void closeSilently(final Connection connection) {
try {
if (connection != null) {
connection.close();
@@ -179,7 +179,7 @@ public final class Closer {
*
* @param context the JNDI Context to close, may be {@code null}
*/
- public static void closeSilent(final Context context) {
+ public static void closeSilently(final Context context) {
try {
close(context);
} catch (final NamingException ignored) {
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java?rev=1605496&r1=1605495&r2=1605496&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java Wed Jun 25 16:51:26 2014
@@ -141,7 +141,7 @@ public final class Throwables {
}
lines.add(ex.toString());
} finally {
- Closer.closeSilent(reader);
+ Closer.closeSilently(reader);
}
return lines;
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/AvailablePortFinder.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/AvailablePortFinder.java?rev=1605496&r1=1605495&r2=1605496&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/AvailablePortFinder.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/AvailablePortFinder.java Wed Jun 25 16:51:26 2014
@@ -78,7 +78,7 @@ public final class AvailablePortFinder {
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
- Closer.closeSilent(LOCK);
+ Closer.closeSilently(LOCK);
}
});
currentMinPort.set(port + 1);
@@ -145,8 +145,8 @@ public final class AvailablePortFinder {
} catch (final IOException e) {
// Do nothing
} finally {
- Closer.closeSilent(ds);
- Closer.closeSilent(ss);
+ Closer.closeSilently(ds);
+ Closer.closeSilently(ss);
}
return false;
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/core/net/FreePortFinder.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/core/net/FreePortFinder.java?rev=1605496&r1=1605495&r2=1605496&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/core/net/FreePortFinder.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/core/net/FreePortFinder.java Wed Jun 25 16:51:26 2014
@@ -45,7 +45,7 @@ public class FreePortFinder {
}
} finally {
for (int i = 0; i < count; ++i) {
- Closer.closeSilent(sockets[i]);
+ Closer.closeSilently(sockets[i]);
}
}
return ports;
Modified: logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java?rev=1605496&r1=1605495&r2=1605496&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java Wed Jun 25 16:51:26 2014
@@ -52,7 +52,7 @@ public final class NoSqlDatabaseManager<
@Override
protected void shutdownInternal() {
// NoSQL doesn't use transactions, so all we need to do here is simply close the client
- Closer.closeSilent(this.connection);
+ Closer.closeSilently(this.connection);
}
@Override
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1605496&r1=1605495&r2=1605496&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Wed Jun 25 16:51:26 2014
@@ -31,6 +31,9 @@
<action issue="LOG4J2-686" dev="ggregory" type="fix">
Core's OptionConverter support for \b is broken (affects PatternLayout).
</action>
+ <action issue="LOG4J2-687" dev="ggregory" type="fix">
+ Rename org.apache.logging.log4j.core.util.Closer.closeSilent() to closeSilently().
+ </action>
</release>
<release version="2.0-rc2" date="2014-06-21" description="Bug fixes and enhancements">
<action issue="LOG4J2-675" dev="rpopma" type="add">