45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 824c531393aa030f161e1ec352a65b7e9302d6b6 Mon Sep 17 00:00:00 2001
|
|
From: Mark Thomas <markt@apache.org>
|
|
Date: Fri, 26 Jul 2019 14:59:57 +0100
|
|
Subject: [PATCH] Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63550
|
|
|
|
Only use the alternateURL for the JNDIRealm when it has been specified
|
|
---
|
|
java/org/apache/catalina/realm/JNDIRealm.java | 4 ++++
|
|
webapps/docs/changelog.xml | 4 ++++
|
|
2 files changed, 8 insertions(+)
|
|
|
|
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java
|
|
index 034c0f0..505dd13 100644
|
|
--- a/java/org/apache/catalina/realm/JNDIRealm.java
|
|
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
|
|
@@ -2378,6 +2378,10 @@ public class JNDIRealm extends RealmBase {
|
|
context = createDirContext(getDirectoryContextEnvironment());
|
|
|
|
} catch (Exception e) {
|
|
+ if (alternateURL == null || alternateURL.length() == 0) {
|
|
+ // No alternate URL. Re-throw the exception.
|
|
+ throw e;
|
|
+ }
|
|
|
|
connectionAttempt = 1;
|
|
|
|
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
|
|
index f088e0d..7bcc3d9 100644
|
|
--- a/webapps/docs/changelog.xml
|
|
+++ b/webapps/docs/changelog.xml
|
|
@@ -248,6 +248,10 @@
|
|
</subsection>
|
|
<subsection name="Jasper">
|
|
<changelog>
|
|
+ <fix>
|
|
+ <bug>63550</bug>: Only try the <code>alternateURL</code> in the
|
|
+ <code>JNDIRealm</code> if one has been specified. (markt)
|
|
+ </fix>
|
|
<add>
|
|
<bug>50234</bug>: Add the capability to generate a web-fragment.xml file
|
|
to JspC. (markt)
|
|
--
|
|
2.23.0
|
|
|