Skip to content

Commit

Permalink
Searching the bug - refactoring to be able to understand what I do read
Browse files Browse the repository at this point in the history 
- just trivial cleanups

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
  • Loading branch information
@dmatej
dmatej committed Jan 26, 2023
1 parent 6483d19 commit bd4476f
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 70 deletions.
102 changes: 47 additions & 55 deletions appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardWrapper.java
View file
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
* Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation.
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -28,7 +28,6 @@
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
// END GlassFish 1343

import java.io.IOException;
import java.lang.reflect.Method;
Expand Down Expand Up @@ -114,7 +113,7 @@ public StandardWrapper() {
* servlet is available. If this value equals Long.MAX_VALUE, the unavailability of this servlet is considered
* permanent.
*/
private long available = 0L;
private long available;

/**
* The broadcaster that sends j2ee notifications.
Expand All @@ -130,7 +129,7 @@ public StandardWrapper() {
/**
* The debugging detail level for this component.
*/
private int debug = 0;
private int debug;

/**
* The facade associated with this wrapper.
Expand Down Expand Up @@ -191,7 +190,7 @@ public StandardWrapper() {
/**
* The notification sequence number.
*/
private long sequenceNumber = 0;
private long sequenceNumber;

/**
* The fully qualified servlet class name for this servlet.
Expand All @@ -206,12 +205,12 @@ public StandardWrapper() {
/**
* Does this servlet implement the SingleThreadModel interface?
*/
private volatile boolean singleThreadModel = false;
private volatile boolean singleThreadModel;

/**
* Are we unloading our servlet instance at the moment?
*/
private boolean unloading = false;
private boolean unloading;

/**
* Maximum number of STM instances.
Expand All @@ -221,7 +220,7 @@ public StandardWrapper() {
/**
* Number of instances currently loaded for a STM servlet.
*/
private int nInstances = 0;
private int nInstances;

/**
* Stack containing the STM instances. TODO: remove
Expand All @@ -241,8 +240,8 @@ public StandardWrapper() {

// To support jmx attributes
private final StandardWrapperValve swValve;
private long loadTime = 0;
private int classLoadTime = 0;
private long loadTime;
private int classLoadTime;

private String description;

Expand Down Expand Up @@ -1179,98 +1178,91 @@ private synchronized void loadServletClass() throws ServletException {
}

// If this "servlet" is really a JSP file, get the right class.
String actualClass = servletClassName;
if ((actualClass == null) && (jspFile != null)) {
Wrapper jspWrapper = (Wrapper) ((Context) getParent()).findChild(Constants.JSP_SERVLET_NAME);
if (jspWrapper != null) {
actualClass = jspWrapper.getServletClassName();
// Merge init parameters
String paramNames[] = jspWrapper.findInitParameters();
for (String paramName : paramNames) {
if (parameters.get(paramName) == null) {
parameters.put(paramName, jspWrapper.findInitParameter(paramName));
}
}
}
}

final String actualClassName = resolveServletClassNameAndParameters();
// Complain if no servlet class has been specified
if (actualClass == null) {
if (actualClassName == null) {
unavailable(null);
String msg = format(rb.getString(LogFacade.NO_SERVLET_BE_SPECIFIED_EXCEPTION), getName());
throw new ServletException(msg);
}

// Acquire an instance of the class loader to be used
Loader loader = getLoader();
if (loader == null) {
Loader currentLoader = getLoader();
if (currentLoader == null) {
unavailable(null);
String msg = format(rb.getString(LogFacade.CANNOT_FIND_LOADER_EXCEPTION), getName());
throw new ServletException(msg);
}

ClassLoader classLoader = loader.getClassLoader();

// Special case class loader for a container provided servlet
//
if (isContainerProvidedServlet(actualClass) && !((Context) getParent()).getPrivileged()) {
final ClassLoader classLoader;
if (isContainerProvidedServlet(actualClassName) && !((Context) getParent()).getPrivileged()) {
// If it is a priviledged context - using its own
// class loader will work, since it's a child of the container
// loader
classLoader = this.getClass().getClassLoader();
} else {
classLoader = currentLoader.getClassLoader();
}

// Load the specified servlet class from the appropriate class loader
Class clazz = null;
Class<?> clazz = null;
try {
if (SecurityUtil.isPackageProtectionEnabled()) {
final ClassLoader fclassLoader = classLoader;
final String factualClass = actualClass;
try {
clazz = AccessController.doPrivileged(new PrivilegedExceptionAction<Class>() {
@Override
public Class run() throws Exception {
if (fclassLoader != null) {
return fclassLoader.loadClass(factualClass);
}

return Class.forName(factualClass);
PrivilegedExceptionAction<Class<?>> action = () -> {
if (classLoader == null) {
return Class.forName(actualClassName);
}
});
return classLoader.loadClass(actualClassName);
};
clazz = AccessController.doPrivileged(action);
} catch (PrivilegedActionException pax) {
Exception ex = pax.getException();
if (ex instanceof ClassNotFoundException) {
throw (ClassNotFoundException) ex;
}

getServletContext().log(format(
rb.getString(ERROR_LOADING_INFO),
new Object[] { fclassLoader, factualClass }), ex);
getServletContext()
.log(format(rb.getString(ERROR_LOADING_INFO), new Object[] {classLoader, actualClassName}), ex);
}
} else {
if (classLoader != null) {
clazz = classLoader.loadClass(actualClass);
} else {
clazz = Class.forName(actualClass);
}
clazz = classLoader == null ? Class.forName(actualClassName) : classLoader.loadClass(actualClassName);
}
} catch (ClassNotFoundException e) {
unavailable(null);
String msgErrorLoadingInfo = format(rb.getString(ERROR_LOADING_INFO),
new Object[] { classLoader, actualClass });
new Object[] {classLoader, actualClassName});
getServletContext().log(msgErrorLoadingInfo, e);
String msg = format(rb.getString(CANNOT_FIND_SERVLET_CLASS_EXCEPTION), actualClass);
String msg = format(rb.getString(CANNOT_FIND_SERVLET_CLASS_EXCEPTION), actualClassName);
throw new ServletException(msg, e);
}

if (clazz == null) {
unavailable(null);
throw new ServletException(format(rb.getString(CANNOT_FIND_SERVLET_CLASS_EXCEPTION), actualClass));
throw new ServletException(format(rb.getString(CANNOT_FIND_SERVLET_CLASS_EXCEPTION), actualClassName));
}

servletClass = castToServletClass(clazz);
}

private String resolveServletClassNameAndParameters() {
if (servletClassName != null || jspFile == null) {
return servletClassName;
}
Wrapper jspWrapper = (Wrapper) ((Context) getParent()).findChild(Constants.JSP_SERVLET_NAME);
if (jspWrapper == null) {
return servletClassName;
}
// Merge init parameters
String[] paramNames = jspWrapper.findInitParameters();
for (String paramName : paramNames) {
parameters.computeIfAbsent(paramName, jspWrapper::findInitParameter);
}
return jspWrapper.getServletClassName();
}

@SuppressWarnings("unchecked")
private Class<? extends Servlet> castToServletClass(Class<?> clazz) {
return (Class<? extends Servlet>) clazz;
Expand Down
20 changes: 5 additions & 15 deletions appserver/web/web-core/src/main/java/org/apache/catalina/security/SecurityUtil.java
View file
Expand Up @@ -264,13 +264,9 @@ private static void execute(final Method method,

try{
Subject subject = null;
PrivilegedExceptionAction<Void> pea =
new PrivilegedExceptionAction<>(){
@Override
public Void run() throws Exception{
method.invoke(targetObject, targetArguments);
return null;
}
PrivilegedExceptionAction<Void> pea = () -> {
method.invoke(targetObject, targetArguments);
return null;
};

// The first argument is always the request object
Expand Down Expand Up @@ -305,15 +301,12 @@ public Void run() throws Exception{
} catch( PrivilegedActionException pe) {
Throwable e;
if (pe.getException() instanceof InvocationTargetException) {
e = ((InvocationTargetException)pe.getException())
.getTargetException();
e = ((InvocationTargetException) pe.getException()).getTargetException();
} else {
e = pe;
}

if (log.isLoggable(Level.FINE)){
log.log(Level.FINE, LogFacade.PRIVILEGE_ACTION_EXCEPTION, e);
}
log.log(Level.FINE, LogFacade.PRIVILEGE_ACTION_EXCEPTION, e);

if (e instanceof UnavailableException) {
throw (UnavailableException) e;
Expand Down Expand Up @@ -416,7 +409,6 @@ public static boolean isPackageProtectionEnabled(){
}


// START OF SJS WS 7.0 6236329
/**
* Return true if a <code>SecurityManager</code> is used and is
* <code>isDoAsRequired</code> is required.
Expand All @@ -427,6 +419,4 @@ public static boolean executeUnderSubjectDoAs(){
}
return false;
}
// END OF SJS WS 7.0 6236329

}

0 comments on commit bd4476f

Please sign in to comment.