You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/06/22 19:53:39 UTC
svn commit: r1604623 - in /logging/log4j/log4j2/trunk/log4j-core: ./
src/main/java/org/apache/logging/log4j/core/config/plugins/processor/
Author: mattsicker
Date: Sun Jun 22 17:53:39 2014
New Revision: 1604623
URL: http://svn.apache.org/r1604623
Log:
Revert: Updata javadoc link.
Removed:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/ShadedResourceTransformer.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/pom.xml
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java
Modified: logging/log4j/log4j2/trunk/log4j-core/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/pom.xml?rev=1604623&r1=1604622&r2=1604623&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/pom.xml Sun Jun 22 17:53:39 2014
@@ -213,12 +213,6 @@
<artifactId>commons-codec</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
- <type>jar</type>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java?rev=1604623&r1=1604622&r2=1604623&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java Sun Jun 22 17:53:39 2014
@@ -22,7 +22,6 @@ import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
import java.util.Enumeration;
@@ -30,7 +29,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import org.apache.logging.log4j.core.config.plugins.util.PluginRegistry;
-import org.apache.logging.log4j.core.util.Closer;
/**
*
@@ -86,32 +84,27 @@ public class PluginCache {
pluginCategories.clear();
while (resources.hasMoreElements()) {
final URL url = resources.nextElement();
- loadCacheFile(url.openStream());
- }
- }
-
- public void loadCacheFile(final InputStream is) throws IOException {
- final DataInputStream in = new DataInputStream(new BufferedInputStream(is));
- try {
- final int count = in.readInt();
- for (int i = 0; i < count; i++) {
- final String category = in.readUTF();
- final ConcurrentMap<String, PluginEntry> m = pluginCategories.getCategory(category);
- final int entries = in.readInt();
- for (int j = 0; j < entries; j++) {
- final PluginEntry entry = new PluginEntry();
- entry.setKey(in.readUTF());
- entry.setClassName(in.readUTF());
- entry.setName(in.readUTF());
- entry.setPrintable(in.readBoolean());
- entry.setDefer(in.readBoolean());
- entry.setCategory(category);
- m.putIfAbsent(entry.getKey(), entry);
+ final DataInputStream in = new DataInputStream(new BufferedInputStream(url.openStream()));
+ try {
+ final int count = in.readInt();
+ for (int i = 0; i < count; i++) {
+ final String category = in.readUTF();
+ final ConcurrentMap<String, PluginEntry> m = pluginCategories.getCategory(category);
+ final int entries = in.readInt();
+ for (int j = 0; j < entries; j++) {
+ final PluginEntry entry = new PluginEntry();
+ entry.setKey(in.readUTF());
+ entry.setClassName(in.readUTF());
+ entry.setName(in.readUTF());
+ entry.setPrintable(in.readBoolean());
+ entry.setDefer(in.readBoolean());
+ entry.setCategory(category);
+ m.putIfAbsent(entry.getKey(), entry);
+ }
}
+ } finally {
+ in.close();
}
- } finally {
- Closer.closeSilent(in);
- Closer.closeSilent(is);
}
}