svn commit: [jahia] r14894 - /trunk/core/src/java/org/jahia/ajax/actionmenus/GetTimeBasedPublishingState.java

[knguyen]

Author: knguyen
Date: Mon Aug 14 15:04:10 2006
New Revision: 14894

URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14894&repname=jahia
Log:
handle npe

Modified:
    
trunk/core/src/java/org/jahia/ajax/actionmenus/GetTimeBasedPublishingState.java

Modified: 
trunk/core/src/java/org/jahia/ajax/actionmenus/GetTimeBasedPublishingState.java
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/ajax/actionmenus/GetTimeBasedPublishingState.java&rev=14894&repname=jahia
==============================================================================
--- 
trunk/core/src/java/org/jahia/ajax/actionmenus/GetTimeBasedPublishingState.java 
(original)
+++ 
trunk/core/src/java/org/jahia/ajax/actionmenus/GetTimeBasedPublishingState.java 
Mon Aug 14 15:04:10 2006
@@ -85,20 +85,21 @@
             final ContentObject currentObject = 
getContentObjectFromString(key);
 
             logger.debug("Getting Time Based Publishing State for: " + key);
+            if ( currentObject != null ){
+                final JahiaObjectDelegate jahiaObjectDelegate =
+                        
jahiaObjectManager.getJahiaObjectDelegate(currentObject.getObjectKey());
+                final RetentionRule retRule = 
tbpService.getRetentionRule(currentObject.getObjectKey());
+                final long nowInMillis = new Date().getTime();
+                final long offSet = 
TimeZone.getDefault().getOffset(nowInMillis);
+                final long now = nowInMillis - offSet;
 
-            final JahiaObjectDelegate jahiaObjectDelegate =
-                    
jahiaObjectManager.getJahiaObjectDelegate(currentObject.getObjectKey());
-            final RetentionRule retRule = 
tbpService.getRetentionRule(currentObject.getObjectKey());
-            final long nowInMillis = new Date().getTime();
-            final long offSet = TimeZone.getDefault().getOffset(nowInMillis);
-            final long now = nowInMillis - offSet;
+                final boolean displayDialog = 
"true".equals(getParameter(request, response, "displayDialog", "false"));
 
-            final boolean displayDialog = "true".equals(getParameter(request, 
response, "displayDialog", "false"));
-
-            if (!displayDialog) {
-                returnTimeBasedPublishingStateImg(mapping, form, request, 
response, retRule, jahiaObjectDelegate, now, jParams);
-            } else {
-                displayTimeBasedPublishingStateDialog(mapping, form, request, 
response, retRule, jahiaObjectDelegate, now, jParams);
+                if (!displayDialog) {
+                    returnTimeBasedPublishingStateImg(mapping, form, request, 
response, retRule, jahiaObjectDelegate, now, jParams);
+                } else {
+                    displayTimeBasedPublishingStateDialog(mapping, form, 
request, response, retRule, jahiaObjectDelegate, now, jParams);
+                }
             }
         } catch (final Exception e) {
             logger.error("Unable to process the request !", e);