From 95e1db9207099e7620e1f77f9f338435670ec9b5 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Fri, 20 Apr 2012 10:52:43 +0200 Subject: [PATCH] Remove some duplicate code. * src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java getDocumentInfo(): This must have been duplicated during the merge from the reports branch. --- ChangeLog | 8 ++++++++ src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a92d6b3..bfb88a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-04-20 Murray Cumming + + Remove some duplicate code. + + * src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java + getDocumentInfo(): This must have been duplicated during the merge from the + reports branch. + 1.21.8.1: 2012-04-19 Murray Cumming diff --git a/src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java b/src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java index 21aa4cc..fdd8513 100644 --- a/src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java +++ b/src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java @@ -297,10 +297,6 @@ public class OnlineGlomServiceImpl extends RemoteServiceServlet implements Onlin if (configuredDoc == null) return new DocumentInfo(); - // Avoid dereferencing a null object: - if (configuredDoc == null) - return new DocumentInfo(); - // FIXME check for authentication return configuredDoc.getDocumentInfo(StringUtils.defaultString(localeID)); -- 2.1.4