From c84becebdda7f658c8dc04b988553d251dbaf04d Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 2 Mar 2011 13:17:55 +0000
Subject: [PATCH] NPE fix

SVN: 20200
---
 .../client/application/dataset/AbstractDataSetsSection.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/AbstractDataSetsSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/AbstractDataSetsSection.java
index 8d7290997a0..894c94f814b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/AbstractDataSetsSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/AbstractDataSetsSection.java
@@ -114,7 +114,10 @@ public abstract class AbstractDataSetsSection extends DisposableTabContent
     {
         // when tab is closed dispose also the metadata component
         super.disposeComponents();
-        metadataComponent.dispose(); // NOTE: second dispose on a grid does nothing
+        if (metadataComponent != null)
+        {
+            metadataComponent.dispose(); // NOTE: second dispose on a grid does nothing
+        }
     }
 
     private static AbstractExternalDataGrid extractBrowser(IDisposableComponent metadataComponent)
-- 
GitLab