aboutsummaryrefslogtreecommitdiffstats
path: root/netx/net/sourceforge/jnlp/ResourcesDesc.java
diff options
context:
space:
mode:
authorJiri Vanek <[email protected]>2013-11-27 14:20:25 +0100
committerJiri Vanek <[email protected]>2013-11-27 14:20:25 +0100
commit4e54b331710269c584f8c328fbb395789b4a5502 (patch)
tree25d5da3e9fb6208c54226da30f5620e7737cdf1c /netx/net/sourceforge/jnlp/ResourcesDesc.java
parentac7b8213a8d58eca5341b2eef8f328ea74126f0f (diff)
Reverted "fix to ManifestedJar1Test cases", better manifestedjar tests, added srtict test
* netx/net/sourceforge/jnlp/Parser.java: added indentation, fixes condition in strict base check * netx/net/sourceforge/jnlp/ResourcesDesc.java: revertedt recently added throw * tests/reproducers/simple/ManifestedJar1/testcases/ManifestedJar1Test.java: (manifestedJar1main2mainNoAppDesc) adapted and (manifestedJar1main2mainNoAppDescStrict) added
Diffstat (limited to 'netx/net/sourceforge/jnlp/ResourcesDesc.java')
-rw-r--r--netx/net/sourceforge/jnlp/ResourcesDesc.java13
1 files changed, 2 insertions, 11 deletions
diff --git a/netx/net/sourceforge/jnlp/ResourcesDesc.java b/netx/net/sourceforge/jnlp/ResourcesDesc.java
index a63c3b0..0726851 100644
--- a/netx/net/sourceforge/jnlp/ResourcesDesc.java
+++ b/netx/net/sourceforge/jnlp/ResourcesDesc.java
@@ -72,19 +72,10 @@ public class ResourcesDesc {
}
public static JARDesc getMainJAR(List<JARDesc> jars) {
- JARDesc markedMain = null;
for (JARDesc jar : jars) {
if (jar.isMain()) {
- if (markedMain == null){
- markedMain = jar;
- } else {
- //more then one main jar specified. It stinks. Return null to die later null;
- throw new RuntimeException("Multiple main JARs specified, refusing to continue.");
- }
- }
- }
- if (markedMain!=null){
- return markedMain;
+ return jar;
+ }
}
if (jars.size() > 0) {