Skip to content

Commit 1a9d797

Browse files
committed
Check autoloader couldn't find jar file in same folder earlier.
1 parent 3155eb6 commit 1a9d797

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

src/java/com/javadeobfuscator/deobfuscator/ui/SwingWindow.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,10 +1449,10 @@ private static List<String> splitQuoteAware(String args1, char splitChar)
14491449
private static void loadWrappers()
14501450
{
14511451
WrapperFactory.setupJarLoader(false);
1452-
deob = WrapperFactory.getDeobfuscator();
1453-
trans = WrapperFactory.getTransformers();
14541452
try
14551453
{
1454+
deob = WrapperFactory.getDeobfuscator();
1455+
trans = WrapperFactory.getTransformers();
14561456
config = deob.getConfig();
14571457
transformers = trans.getTransformers();
14581458
for (Class<?> clazz : transformers)

src/java/com/javadeobfuscator/deobfuscator/ui/wrap/Deobfuscator.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class Deobfuscator
1616
/**
1717
* ClassLoader to load classes from deobfuscator jar.
1818
*/
19-
private ByteLoader loader;
19+
private final ByteLoader loader;
2020
/**
2121
* Config wrapper to use in deobfuscator.
2222
*/
@@ -26,8 +26,12 @@ public class Deobfuscator
2626
*/
2727
private Object instance;
2828

29-
Deobfuscator(ByteLoader loader)
29+
Deobfuscator(ByteLoader loader) throws FallbackException
3030
{
31+
if (loader == null)
32+
{
33+
throw new FallbackException("Loading Problem", "Could not create Config instance.", new NullPointerException("loader is null"));
34+
}
3135
this.loader = loader;
3236
}
3337

src/java/com/javadeobfuscator/deobfuscator/ui/wrap/Transformers.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,14 @@ public class Transformers
2121
/**
2222
* ClassLoader to load classes from deobfuscator jar.
2323
*/
24-
private ByteLoader loader;
24+
private final ByteLoader loader;
2525

26-
public Transformers(ByteLoader loader)
26+
public Transformers(ByteLoader loader) throws FallbackException
2727
{
28+
if (loader == null)
29+
{
30+
throw new FallbackException("Loading Problem", "Could not create Config instance.", new NullPointerException("loader is null"));
31+
}
2832
this.loader = loader;
2933
}
3034

src/java/com/javadeobfuscator/deobfuscator/ui/wrap/WrapperFactory.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.util.zip.ZipFile;
1212

1313
import com.javadeobfuscator.deobfuscator.ui.util.ByteLoader;
14+
import com.javadeobfuscator.deobfuscator.ui.util.FallbackException;
1415
import com.javadeobfuscator.deobfuscator.ui.util.InvalidJarException;
1516
import com.javadeobfuscator.deobfuscator.ui.util.MiniClassReader;
1617

@@ -28,15 +29,15 @@ public class WrapperFactory
2829
/**
2930
* @return Deobfuscator wrapper.
3031
*/
31-
public static Deobfuscator getDeobfuscator()
32+
public static Deobfuscator getDeobfuscator() throws FallbackException
3233
{
3334
return new Deobfuscator(loader);
3435
}
3536

3637
/**
3738
* @return Transformers wrapper.
3839
*/
39-
public static Transformers getTransformers()
40+
public static Transformers getTransformers() throws FallbackException
4041
{
4142
return new Transformers(loader);
4243
}

0 commit comments

Comments
 (0)