From 19804de91f3775bf797a7a383396ffd60e77c8d6 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 28 Jan 2015 13:49:05 +0000
Subject: [PATCH] SSDM-1191: do not throw an exception in
ServiceProviderTestWrapper.restoreApplicationContext() if cached application
context is undefined.
SVN: 33352
---
.../openbis/dss/generic/shared/ServiceProviderTestWrapper.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProviderTestWrapper.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProviderTestWrapper.java
index ed904d5433d..5d4338f01bd 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProviderTestWrapper.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProviderTestWrapper.java
@@ -74,8 +74,7 @@ public class ServiceProviderTestWrapper
{
if (cachedApplicationContext == null)
{
- throw new IllegalStateException("Undefined cached application context. "
- + "Most likely reason: Missing invocation of ServiceProviderTestWrapper.setApplicationContext().");
+ return;
}
ServiceProvider.setBeanFactory(cachedApplicationContext);
cachedApplicationContext = null;
--
GitLab