From 4aef3680572702c9949dfc208038fee437b830f0 Mon Sep 17 00:00:00 2001
From: "Marvin S. Addison" <marvin.addison@gmail.com>
Date: Sat, 17 Jan 2015 11:25:03 -0500
Subject: [PATCH] CASC-237 Make OpenSAML bootstrap conditional.

---
 .../jasig/cas/client/validation/Saml11TicketValidator.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java
index c99ea1d..007fc5c 100644
--- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java
+++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java
@@ -56,8 +56,11 @@ public final class Saml11TicketValidator extends AbstractUrlBasedTicketValidator
 
     static {
         try {
-            // we really only need to do this once, so this is why its here.
-            DefaultBootstrap.bootstrap();
+            // Check for prior OpenSAML initialization to prevent double init
+            // that would overwrite existing OpenSAML configuration
+            if (Configuration.getParserPool() == null) {
+                DefaultBootstrap.bootstrap();
+            }
         } catch (final ConfigurationException e) {
             throw new RuntimeException(e);
         }