zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Streaming: Workaround for jwebcache and i2phex (ticket #1231)

Browse Source
This commit is contained in:
zzz
2014-03-12 16:02:23 +00:00
parent beed080390
commit 738c5ed14e
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
View File

@@ -225,7 +225,10 @@ public class I2PSocketManagerFactory {
private static I2PSocketManager createManager(I2PSession session, Properties opts, String name) {
I2PAppContext context = I2PAppContext.getGlobalContext();
String classname = opts.getProperty(PROP_MANAGER, DEFAULT_MANAGER);
// As of 0.9.12, ignore this setting, as jwebcache and i2phex set it to the old value.
// There is no other valid manager.
//String classname = opts.getProperty(PROP_MANAGER, DEFAULT_MANAGER);
String classname = DEFAULT_MANAGER;
try {
Class<?> cls = Class.forName(classname);
if (!I2PSocketManager.class.isAssignableFrom(cls))

13
apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java Normal file
View File

@@ -0,0 +1,13 @@
package net.i2p.client.streaming;
/**
* Moved to net.i2p.client.streaming.impl in 0.9.10.
* Restored as a dummy class in 0.9.12, as i2phex imports it and
* calls I2PSocketManagerFull.class.getName() to pass to I2PSocketManagerFactory.
* I2PSocketManagerFactory ignores the class setting as of 0.9.12.
* This does not implement I2PSocketManager. Do not use.
*
* @since 0.9.12
* @deprecated
*/
public class I2PSocketManagerFull {}