From 9dde952ed682e931c1eae508159e72dd59addb12 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sun, 25 May 2008 23:26:57 +0200 Subject: [PATCH] improve priority parsing --- src/net/pterodactylus/fcp/PersistentGet.java | 3 ++- src/net/pterodactylus/fcp/PersistentPut.java | 6 +----- src/net/pterodactylus/fcp/PersistentPutDir.java | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/net/pterodactylus/fcp/PersistentGet.java b/src/net/pterodactylus/fcp/PersistentGet.java index 81919cd..0d5a6f4 100644 --- a/src/net/pterodactylus/fcp/PersistentGet.java +++ b/src/net/pterodactylus/fcp/PersistentGet.java @@ -19,6 +19,7 @@ package net.pterodactylus.fcp; + /** * The “PersistentGet” message is sent to the client to inform it about a * persistent download, either in the client-local queue or in the global queue. @@ -112,7 +113,7 @@ public class PersistentGet extends BaseMessage { * @return The priority of the request */ public Priority getPriority() { - return Priority.values()[FcpUtils.safeParseInt(getField("PriorityClass"), 7)]; + return Priority.values()[FcpUtils.safeParseInt(getField("PriorityClass"), Priority.unknown.ordinal())]; } /** diff --git a/src/net/pterodactylus/fcp/PersistentPut.java b/src/net/pterodactylus/fcp/PersistentPut.java index 8a1aae5..1457146 100644 --- a/src/net/pterodactylus/fcp/PersistentPut.java +++ b/src/net/pterodactylus/fcp/PersistentPut.java @@ -112,11 +112,7 @@ public class PersistentPut extends BaseMessage { * priority could not be parsed */ public Priority getPriority() { - try { - return Priority.values()[Integer.valueOf(getField("PriorityClass"))]; - } catch (NumberFormatException nfe1) { - return Priority.unknown; - } + return Priority.values()[FcpUtils.safeParseInt(getField("PriorityClass"), Priority.unknown.ordinal())]; } /** diff --git a/src/net/pterodactylus/fcp/PersistentPutDir.java b/src/net/pterodactylus/fcp/PersistentPutDir.java index 324f9b8..569ca21 100644 --- a/src/net/pterodactylus/fcp/PersistentPutDir.java +++ b/src/net/pterodactylus/fcp/PersistentPutDir.java @@ -71,7 +71,7 @@ public class PersistentPutDir extends BaseMessage { * @return The priority of the request */ public Priority getPriority() { - return Priority.valueOf(getField("PriorityClass")); + return Priority.values()[FcpUtils.safeParseInt(getField("PriorityClass"), Priority.unknown.ordinal())]; } /** -- 2.7.4