From 87209ce46132d420932d1b2d5b94210a5ce35390 Mon Sep 17 00:00:00 2001 From: Walter Korman Date: Wed, 5 Feb 2003 22:48:50 +0000 Subject: [PATCH] Deal gracefully with having a null jar source in toString() even after an attempt to resolve the jar file. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2243 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/resource/ResourceBundle.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/resource/ResourceBundle.java b/src/java/com/threerings/resource/ResourceBundle.java index 5ad6aaab0..49fe878c6 100644 --- a/src/java/com/threerings/resource/ResourceBundle.java +++ b/src/java/com/threerings/resource/ResourceBundle.java @@ -1,5 +1,5 @@ // -// $Id: ResourceBundle.java,v 1.8 2003/01/18 19:56:45 mdb Exp $ +// $Id: ResourceBundle.java,v 1.9 2003/02/05 22:48:50 shaper Exp $ package com.threerings.resource; @@ -144,8 +144,10 @@ public class ResourceBundle { try { resolveJarFile(); - return "[path=" + _jarSource.getName() + + return (_jarSource == null) ? "[file=" + _source + "]" : + "[path=" + _jarSource.getName() + ", entries=" + _jarSource.size() + "]"; + } catch (IOException ioe) { return "[file=" + _source + ", ioe=" + ioe + "]"; }