From afea8da49e9923f00c06f44afcd7f264f15043c7 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 14 Dec 2011 15:42:59 +0000
Subject: [PATCH] =?UTF-8?q?Fix=20f=C3=BCr=20NPE=20wenn=20keine=20ShortDesc?=
 =?UTF-8?q?ription=20vorhanden=20ist.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@1356 8810af33-2d31-482b-a856-94f89814c4df
---
 .../arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java
index 947ddb7c9..0f9ea6488 100644
--- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java
+++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java
@@ -70,6 +70,7 @@ public class SciDepartmentSummaryTab implements GenericOrgaUnitTab {
         final long start = System.currentTimeMillis();
 
         if ((department != null)
+            && (department.getDepartmentShortDescription() != null)
             && !department.getDepartmentShortDescription().trim().isEmpty()) {
             final Element shortDescElem = parent.newChildElement("shortDesc");
             shortDescElem.setText(department.getDepartmentShortDescription());