From 2e32bb9aca73af4ad9bfa8d47fa6ec694b43b2a0 Mon Sep 17 00:00:00 2001 From: Shikhar Bhushan Date: Thu, 12 Aug 2010 17:31:42 +0100 Subject: [PATCH] simplify --- src/main/java/net/schmizz/sshj/common/Message.java | 5 +++++ src/main/java/net/schmizz/sshj/common/SSHPacket.java | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/schmizz/sshj/common/Message.java b/src/main/java/net/schmizz/sshj/common/Message.java index 28bd9077..dd730526 100644 --- a/src/main/java/net/schmizz/sshj/common/Message.java +++ b/src/main/java/net/schmizz/sshj/common/Message.java @@ -18,6 +18,7 @@ package net.schmizz.sshj.common; /** SSH message identifiers */ public enum Message { + UNKNOWN(0), DISCONNECT(1), IGNORE(2), UNIMPLEMENTED(3), @@ -68,6 +69,10 @@ public enum Message { static { for (Message c : Message.values()) cache[c.toByte()] = c; + for (int i = 0; i < 256; i++) { + if (cache[i] == null) + cache[i] = UNKNOWN; + } } public static Message fromByte(byte b) { diff --git a/src/main/java/net/schmizz/sshj/common/SSHPacket.java b/src/main/java/net/schmizz/sshj/common/SSHPacket.java index 0064bdc8..0da104d6 100644 --- a/src/main/java/net/schmizz/sshj/common/SSHPacket.java +++ b/src/main/java/net/schmizz/sshj/common/SSHPacket.java @@ -76,11 +76,7 @@ public class SSHPacket * @return the message identifier */ public Message readMessageID() { - byte b = readByte(); - Message cmd = Message.fromByte(b); - if (cmd == null) - throw new BufferException("Unknown message ID: " + b); - return cmd; + return Message.fromByte(readByte()); } /**