diff options
| author | EvilSeph <evilseph@gmail.com> | 2012-06-08 21:02:48 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-06-09 02:52:14 -0400 |
| commit | 3df6608a725a796ed03cbf09b50a914299c9a400 (patch) | |
| tree | 5d5714f78ea87b64659bf42b6cc5b1d0ff1a775e /src/main/java | |
| parent | 873ce288c24f88580e3cfc5278f6965f5ec8d442 (diff) | |
| download | craftbukkit-3df6608a725a796ed03cbf09b50a914299c9a400.tar craftbukkit-3df6608a725a796ed03cbf09b50a914299c9a400.tar.gz craftbukkit-3df6608a725a796ed03cbf09b50a914299c9a400.tar.lz craftbukkit-3df6608a725a796ed03cbf09b50a914299c9a400.tar.xz craftbukkit-3df6608a725a796ed03cbf09b50a914299c9a400.zip | |
Fixed potential infinite loop in RCON handling. Fixes BUKKIT-1570
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/minecraft/server/RemoteControlSession.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/RemoteControlSession.java b/src/main/java/net/minecraft/server/RemoteControlSession.java index b56a8db8..9d4c234a 100644 --- a/src/main/java/net/minecraft/server/RemoteControlSession.java +++ b/src/main/java/net/minecraft/server/RemoteControlSession.java @@ -84,12 +84,12 @@ public class RemoteControlSession extends RemoteConnectionThread { } } } catch (SocketTimeoutException sockettimeoutexception) { - continue; + return; // CraftBukkit - shut down the thread after hitting an exception. } catch (IOException ioexception) { if (this.running) { this.info("IO: " + ioexception.getMessage()); } - continue; + return; // CraftBukkit - shut down the thread after hitting an exception. } } // CraftBukkit - Loop shift } catch (Exception exception1) { |