From e5186b0f7b247f3f801890e03ab48ecbc80cbc3b Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Sun, 20 Jun 2021 09:39:12 -0400
Subject: [PATCH] Improve error handling on sort
---
.../src/net/i2p/servlet/I2PDefaultServlet.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/apps/jetty/java/src/net/i2p/servlet/I2PDefaultServlet.java b/apps/jetty/java/src/net/i2p/servlet/I2PDefaultServlet.java
index 1d839cba51..4ad2e890eb 100644
--- a/apps/jetty/java/src/net/i2p/servlet/I2PDefaultServlet.java
+++ b/apps/jetty/java/src/net/i2p/servlet/I2PDefaultServlet.java
@@ -288,18 +288,16 @@ public class I2PDefaultServlet extends DefaultServlet
}
public int compare(String a, String b) {
- Resource ra, rb;
try {
- ra = _base.addPath(a);
- rb = _base.addPath(b);
- } catch (Exception e) {
+ Resource ra = _base.addPath(a);
+ Resource rb = _base.addPath(b);
+ boolean da = ra.isDirectory();
+ boolean db = rb.isDirectory();
+ if (da && !db) return -1;
+ if (!da && db) return 1;
+ } catch (Exception e) {
// see above
- return 0;
}
- boolean da = ra.isDirectory();
- boolean db = rb.isDirectory();
- if (da && !db) return -1;
- if (!da && db) return 1;
return _coll.compare(a, b);
}
}
--
GitLab