Instantly share code, notes, and snippets.

Embed
What would you like to do?
rome-v1_0RC2-osgi.patch
Index: pom.xml
===================================================================
RCS file: /cvs/rome/pom.xml,v
retrieving revision 1.5
diff -u -r1.5 pom.xml
--- pom.xml 8 Jan 2009 23:12:11 -0000 1.5
+++ pom.xml 19 Oct 2010 07:40:33 -0000
@@ -4,7 +4,7 @@
<groupId>rome</groupId>
<artifactId>rome</artifactId>
<name>ROME, RSS and atOM utilitiEs for Java</name>
- <version>1.0RC2</version>
+ <version>1.0RC2-osgi</version>
<packaging>jar</packaging>
<description>All Roads Lead to ROME. ROME is a set of Atom/RSS Java utilities that make it
easy to work in Java with most syndication formats. Today it accepts all flavors of RSS
Index: src/java/com/sun/syndication/io/WireFeedInput.java
===================================================================
RCS file: /cvs/rome/src/java/com/sun/syndication/io/WireFeedInput.java,v
retrieving revision 1.16
diff -u -r1.16 WireFeedInput.java
--- src/java/com/sun/syndication/io/WireFeedInput.java 1 Apr 2008 11:35:33 -0000 1.16
+++ src/java/com/sun/syndication/io/WireFeedInput.java 19 Oct 2010 07:40:34 -0000
@@ -59,10 +59,10 @@
private static FeedParsers getFeedParsers() {
synchronized(WireFeedInput.class) {
FeedParsers parsers = (FeedParsers)
- clMap.get(Thread.currentThread().getContextClassLoader());
+ clMap.get(WireFeedInput.class.getClassLoader());
if (parsers == null) {
parsers = new FeedParsers();
- clMap.put(Thread.currentThread().getContextClassLoader(), parsers);
+ clMap.put(WireFeedInput.class.getClassLoader(), parsers);
}
return parsers;
}
Index: src/java/com/sun/syndication/io/WireFeedOutput.java
===================================================================
RCS file: /cvs/rome/src/java/com/sun/syndication/io/WireFeedOutput.java,v
retrieving revision 1.5
diff -u -r1.5 WireFeedOutput.java
--- src/java/com/sun/syndication/io/WireFeedOutput.java 5 Jan 2009 22:11:45 -0000 1.5
+++ src/java/com/sun/syndication/io/WireFeedOutput.java 19 Oct 2010 07:40:34 -0000
@@ -48,10 +48,10 @@
private static FeedGenerators getFeedGenerators() {
synchronized(WireFeedOutput.class) {
FeedGenerators generators = (FeedGenerators)
- clMap.get(Thread.currentThread().getContextClassLoader());
+ clMap.get(WireFeedOutput.class.getClassLoader());
if (generators == null) {
generators = new FeedGenerators();
- clMap.put(Thread.currentThread().getContextClassLoader(), generators);
+ clMap.put(WireFeedOutput.class.getClassLoader(), generators);
}
return generators;
}
Index: src/java/com/sun/syndication/io/impl/PluginManager.java
===================================================================
RCS file: /cvs/rome/src/java/com/sun/syndication/io/impl/PluginManager.java,v
retrieving revision 1.11
diff -u -r1.11 PluginManager.java
--- src/java/com/sun/syndication/io/impl/PluginManager.java 5 Jan 2009 22:45:22 -0000 1.11
+++ src/java/com/sun/syndication/io/impl/PluginManager.java 19 Oct 2010 07:40:34 -0000
@@ -129,7 +129,7 @@
*
*/
private Class[] getClasses() throws ClassNotFoundException {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ ClassLoader classLoader = this.getClass().getClassLoader();
List classes = new ArrayList();
boolean useLoadClass = Boolean.valueOf(System.getProperty("rome.pluginmanager.useloadclass", "false")).booleanValue();
for (int i = 0; i <_propertyValues.length; i++) {
Index: src/java/com/sun/syndication/io/impl/PropertiesLoader.java
===================================================================
RCS file: /cvs/rome/src/java/com/sun/syndication/io/impl/PropertiesLoader.java,v
retrieving revision 1.2
diff -u -r1.2 PropertiesLoader.java
--- src/java/com/sun/syndication/io/impl/PropertiesLoader.java 31 Jul 2007 16:58:07 -0000 1.2
+++ src/java/com/sun/syndication/io/impl/PropertiesLoader.java 19 Oct 2010 07:40:34 -0000
@@ -40,11 +40,11 @@
public static PropertiesLoader getPropertiesLoader() {
synchronized(PropertiesLoader.class) {
PropertiesLoader loader = (PropertiesLoader)
- clMap.get(Thread.currentThread().getContextClassLoader());
+ clMap.get(PropertiesLoader.class.getClassLoader());
if (loader == null) {
try {
loader = new PropertiesLoader(MASTER_PLUGIN_FILE, EXTRA_PLUGIN_FILE);
- clMap.put(Thread.currentThread().getContextClassLoader(), loader);
+ clMap.put(PropertiesLoader.class.getClassLoader(), loader);
}
catch (IOException ex) {
throw new RuntimeException(ex);
@@ -66,7 +66,7 @@
*/
private PropertiesLoader(String masterFileLocation,String extraFileLocation) throws IOException {
List propertiesList = new ArrayList();
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ ClassLoader classLoader = this.getClass().getClassLoader();
try {
InputStream is = classLoader.getResourceAsStream(masterFileLocation);
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment