From 5f404082750764fc10fed1f55e908a2a2e2e04d7 Mon Sep 17 00:00:00 2001 From: NicerWang Date: Tue, 17 May 2022 14:29:23 +0800 Subject: [PATCH] bug:throw error --- adapter/pom.xml | 2 +- .../{adapter-1.0.0.jar => adapter-1.0.1.jar} | Bin 30525 -> 30681 bytes .../{adapter-1.0.0.xml => adapter-1.0.1.xml} | 2 +- .../java/djudger/allocator/Allocator.java | 6 +++--- .../allocator/classic/ClassicAllocator.java | 5 ++++- .../threadpool/ThreadPoolAllocator.java | 6 +++++- 6 files changed, 14 insertions(+), 7 deletions(-) rename adapter/release/{adapter-1.0.0.jar => adapter-1.0.1.jar} (55%) rename adapter/release/{adapter-1.0.0.xml => adapter-1.0.1.xml} (98%) diff --git a/adapter/pom.xml b/adapter/pom.xml index 1e83db9..e080945 100644 --- a/adapter/pom.xml +++ b/adapter/pom.xml @@ -6,7 +6,7 @@ nicer.djudger adapter - 1.0.0 + 1.0.1 8 diff --git a/adapter/release/adapter-1.0.0.jar b/adapter/release/adapter-1.0.1.jar similarity index 55% rename from adapter/release/adapter-1.0.0.jar rename to adapter/release/adapter-1.0.1.jar index cc969dc999742dbb7a56d82fb2ed91c3c14fa422..de6923aa78164a97da70cd52a17f7b20d7107894 100644 GIT binary patch delta 9857 zcmY*f1ymf%(#G9kac6ONhu|9AEx1c?XM_7fSTuNWcMYz=Aq1D;L4qY%(4Ua|-uv&I zv!}XizOJe6p5CsW`Z`abmrkM4)s$f2P@w)?p6+$;(SfiY&w?ih_D^k&=0)5w{1Fg3 zXx1001I_y)!O#MKWWxxw1@udS9rg_7r9h1kg8EV@!RGs`*}#qei+Kw;{Hrl06i0l) z+K-k^_Kq+dkl?FJl0vj@&)(pHC<}&Gf zLn&<8{WakjktAnA>#rN*d1;Fin;+R#Ll8ml#1*r2)#t;6W0~fp?)aC296|xmqTEE3 zrWdzcXh(6IX~EmFHL8AD^(a?3{Obd$gdi9-CE~v`g!E^Iv_SW_&>l!oP{lY<^{ z^k89cwB`BYri8`oPp_Ak=f(E9Sy?5KoRk}1&t5!C8a$vrziq`xF1bt?&&D$A;lm|tPf zA29IMlGCDGj?trqP3W=Uop}OJh<+WJadSy$q71GbL^Ig3zGCD%WZ+fcXd*uH72SxG~|@#-iI)5U5X>shIl$rnk~RL!S}^smUO)TUdu zH_hBI0#4KJ3{+rUn|=Zl!(N*sidzSdh~)D2yD}H6=^Lg&d&u#SHp8ee5ZkdzlO1~U z5H3c`hR3%hhwkUYwts#Pi}UH} zF%c=vlQB9Ul3BqisJXsC`ff9{uHqj{=~eQP{S~(X`j38LJTxLK{z#T?L3?%K{!#2< z3>o0*sn+7p`7*3eCXKz!Q78PG@GsAo_gp zGJN426|AvOm@+1?&=?!$vq-%jcQF=YRkNQf)S5<$C< zchP-B)&p}iPAVIP;9>YPdc5*ekcf0XOPYJ&)))ivMX0)&@M*S2H5Q zfob!pv9DNra#>=G)M<^zNqLFE*a~Vhtv9&Id4iGBID8yT5siBL9kk`@uol&arGoF> z81}3LR}jqeEFy@|in|!J3h!J$95}0rDcxG%*{qy%4x^B#Bk5Ua6q^iig3LCufXzN} zmEK?h>y2^s6*Rq&Nq@8sg3|)-jQv{vWXmE&`H$NVD6hSL7&6kxMLLb4DW=`N3&z}{ z{*J_DmAXdGb3nb_&J0KuR+W^7--6h50%(m2J~PNX&Ty_hv_N zzA&y#gv*_wwGox}E|MU32xQ|CFyHh2%s2eC3mHalOV!N2K6Aepz7+&NydFAWrYG&p z>Pogn^BO}j^mue)j!(p4Logr(cOdoWClTF)G2*qj8j@BP(Rxar4~~gAWBlj=sJew? z9G)u0H4}mX6Ptl-QEZ#SUt+o{IC941F|5CV@hkKMj5*j%HLRbyLO?ZMyoCyJ$F!1i zl2X{S(JQGeEBdr`r+k|`CdvjY21`gnA0?Fd1hYO

4=waH>YG0b->30*lF#t_!C# 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

^mJlOy8aI~Hs_|FA- zaA5dD%7HLAiobNo-jVx7<~jcD*ovd*OP$0?=0&b~54laM6QRO1_a;*5n$${Ls=%W8QWBiwT0x^24{sOOkO9G?H{7gb2 zgB-qnAqzpUTuETMIi6KC5H(kl7nJj}N`n6%6*8p7m5}m}x%WoRb{@}b>ODLZ6!1U2 zeU^p6R|3yqQV6OWKE)s4ON!`u0TRJNLCO6KSP6OMrt@O#U+IZ|V?-gn>UhswB4h}h z2hI!l--oFGp$mh#6kfnY?j$e3Kc_0zXBYk8prF+LhkJH0TJ;&o1<_Nbgv7X^y@3B0 zLqkFF{R<4#cm@kVP(09H#)HU%1jbzdS;Yu>`2`GJW_GbK2!e7Of$sU^Y1H>=Sc$H0O{}~e=)H3 zY+%C{l50x=A@cg$kN?*WiuS)1EU2d^61!(0BgEMY<$o&)66^(lG5K?Y9@6cF`{KsG W*3o}0{F&Ji$hns+LXhJh<^KT&k4d%w delta 9710 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 z

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 diff --git a/adapter/release/adapter-1.0.0.xml b/adapter/release/adapter-1.0.1.xml similarity index 98% rename from adapter/release/adapter-1.0.0.xml rename to adapter/release/adapter-1.0.1.xml index 1e83db9..e080945 100644 --- a/adapter/release/adapter-1.0.0.xml +++ b/adapter/release/adapter-1.0.1.xml @@ -6,7 +6,7 @@ nicer.djudger adapter - 1.0.0 + 1.0.1 8 diff --git a/adapter/src/main/java/djudger/allocator/Allocator.java b/adapter/src/main/java/djudger/allocator/Allocator.java index 9c71ec5..c15b888 100644 --- a/adapter/src/main/java/djudger/allocator/Allocator.java +++ b/adapter/src/main/java/djudger/allocator/Allocator.java @@ -41,7 +41,7 @@ public void run() { protected abstract void removeAllContainers(); - public final Task runCode(String language, List commands, Integer timeLimit, TimeUnit timeUnit, String codeIdentifier, String code) throws Throwable { + public final Task runCode(String language, List commands, Integer timeLimit, TimeUnit timeUnit, String codeIdentifier, String code) throws DJudgerException { if (stopped) throw new DJudgerException("DJudger has stopped"); LangConfig target = langConfigMap.get(language); @@ -64,7 +64,7 @@ public final Task runCode(String language, List commands, Integer timeLi return task; } - protected Task preProcess(String language, String fileName, List rawCommands, String codeIdentifier, String code, LangConfig target) throws Throwable { + protected Task preProcess(String language, String fileName, List rawCommands, String codeIdentifier, String code, LangConfig target) throws DJudgerException { if (language == null || rawCommands == null || codeIdentifier == null || code == null || rawCommands.size() == 0 || codeIdentifier.length() == 0 || code.length() == 0) { throw new IllegalArgumentException("No Args should be null"); } @@ -86,7 +86,7 @@ protected Task preProcess(String language, String fileName, List rawComm try { FileUtil.writeCode(hostDirectory, hostFilePath, code); } catch (IOException e) { - throw new DJudgerException("IO Error").initCause(e); + throw new DJudgerException("IO Error"); } task.setRemotePath("/code/" + language); task.setHostPath(hostDirectory); diff --git a/adapter/src/main/java/djudger/allocator/classic/ClassicAllocator.java b/adapter/src/main/java/djudger/allocator/classic/ClassicAllocator.java index 6cc5b66..aa94ab6 100644 --- a/adapter/src/main/java/djudger/allocator/classic/ClassicAllocator.java +++ b/adapter/src/main/java/djudger/allocator/classic/ClassicAllocator.java @@ -16,7 +16,10 @@ public class ClassicAllocator extends Allocator { public ClassicAllocator(Config config) { super(config); - classicAllocatorConfig = (ClassicAllocatorConfig) config.allocatorConfig; + if(!(config.allocatorConfig instanceof ClassicAllocatorConfig)){ + classicAllocatorConfig = new ClassicAllocatorConfig(); + } + else classicAllocatorConfig = (ClassicAllocatorConfig) config.allocatorConfig; for (LangConfig langConfig : langConfigMap.values()) { langMap.put(langConfig.languageName, new Lang()); } diff --git a/adapter/src/main/java/djudger/allocator/threadpool/ThreadPoolAllocator.java b/adapter/src/main/java/djudger/allocator/threadpool/ThreadPoolAllocator.java index d414ce7..3565e72 100644 --- a/adapter/src/main/java/djudger/allocator/threadpool/ThreadPoolAllocator.java +++ b/adapter/src/main/java/djudger/allocator/threadpool/ThreadPoolAllocator.java @@ -4,6 +4,7 @@ import djudger.LangConfig; import djudger.Task; import djudger.allocator.Allocator; +import djudger.allocator.classic.ClassicAllocator; import java.util.HashMap; import java.util.Map; @@ -20,7 +21,10 @@ public class ThreadPoolAllocator extends Allocator { public ThreadPoolAllocator(Config config) { super(config); - threadPoolAllocatorConfig = (ThreadPoolAllocatorConfig) config.allocatorConfig; + if(!(config.allocatorConfig instanceof ThreadPoolAllocatorConfig)){ + threadPoolAllocatorConfig = new ThreadPoolAllocatorConfig(); + } + else threadPoolAllocatorConfig = (ThreadPoolAllocatorConfig) config.allocatorConfig; for (LangConfig lang : langConfigMap.values()) { executorMap.put(lang.languageName, new ThreadPoolExecutor(threadPoolAllocatorConfig.corePoolSize, threadPoolAllocatorConfig.maximumPoolSize, threadPoolAllocatorConfig.keepAliveTime,