Attachment 710736 Details for Bug 922180 – JBWEB7.0.17.GA patch diff

[patch] JBWEB7.0.17.GA patch diff

922180.diff (text/plain), 2.46 KB, created by Aaron Ogburn on 2013-03-15 17:02:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aaron Ogburn

Created: 2013-03-15 17:02:35 UTC

Size: 2.46 KB

patch

obsolete

>Index: java/org/apache/catalina/startup/ContextConfig.java
>===================================================================
>--- java/org/apache/catalina/startup/ContextConfig.java	(revision 2175)
>+++ java/org/apache/catalina/startup/ContextConfig.java	(working copy)
>@@ -117,6 +117,12 @@
> 
> 
>     /**
>+     * Static lock to fix BZ-922180
>+     */
>+    private static final Object authenticatorsInitLock = new Object();
>+
>+
>+    /**
>      * The Context we are associated with.
>      */
>     protected Context context = null;
>@@ -277,23 +283,26 @@
>         }
>         if (authenticator == null) {
>             // Load our mapping properties if necessary
>-            if (authenticators == null) {
>-                try {
>-                    InputStream is=this.getClass().getClassLoader().getResourceAsStream("org/apache/catalina/startup/Authenticators.properties");
>-                    if( is!=null ) {
>-                        authenticators = new Properties();
>-                        authenticators.load(is);
>-                    } else {
>+            // Synchronize here to avoid deployment failures from an empty authenticators Property set (BZ-922180).
>+            synchronized(authenticatorsInitLock) {
>+                if (authenticators == null) {
>+                    try {
>+                        InputStream is=this.getClass().getClassLoader().getResourceAsStream("org/apache/catalina/startup/Authenticators.properties");
>+                        if( is!=null ) {
>+                            authenticators = new Properties();
>+                            authenticators.load(is);
>+                        } else {
>+                            log.error(sm.getString(
>+                                    "contextConfig.authenticatorResources"));
>+                            ok=false;
>+                            return;
>+                        }
>+                    } catch (IOException e) {
>                         log.error(sm.getString(
>-                                "contextConfig.authenticatorResources"));
>-                        ok=false;
>+                                    "contextConfig.authenticatorResources"), e);
>+                        ok = false;
>                         return;
>                     }
>-                } catch (IOException e) {
>-                    log.error(sm.getString(
>-                                "contextConfig.authenticatorResources"), e);
>-                    ok = false;
>-                    return;
>                 }
>             }
>

Actions: View | Diff

Attachments on bug 922180: 710736