You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2014/02/22 02:58:23 UTC
svn commit: r1570779 [4/7] - in
/tomee/tomee/trunk/container/openejb-core/src/main: config/
java/org/apache/openejb/ java/org/apache/openejb/assembler/classic/
java/org/apache/openejb/assembler/classic/cmd/
java/org/apache/openejb/bval/ java/org/apache...
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AbstractService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AbstractService.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AbstractService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AbstractService.java Sat Feb 22 01:58:19 2014
@@ -215,16 +215,30 @@ public abstract class AbstractService im
@Override
public boolean equals(final Object o) {
- if (this == o) return true;
- if (!(o instanceof AbstractService)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof AbstractService)) {
+ return false;
+ }
final AbstractService that = (AbstractService) o;
- if (id != null ? !id.equals(that.id) : that.id != null) return false;
- if (jar != null ? !jar.equals(that.jar) : that.jar != null) return false;
- if (type != null ? !type.equals(that.type) : that.type != null) return false;
- if (provider != null ? !provider.equals(that.provider) : that.provider != null) return false;
- if (properties != null ? !properties.equals(that.properties) : that.properties != null) return false;
+ if (id != null ? !id.equals(that.id) : that.id != null) {
+ return false;
+ }
+ if (jar != null ? !jar.equals(that.jar) : that.jar != null) {
+ return false;
+ }
+ if (type != null ? !type.equals(that.type) : that.type != null) {
+ return false;
+ }
+ if (provider != null ? !provider.equals(that.provider) : that.provider != null) {
+ return false;
+ }
+ if (properties != null ? !properties.equals(that.properties) : that.properties != null) {
+ return false;
+ }
return true;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java Sat Feb 22 01:58:19 2014
@@ -61,7 +61,9 @@ public abstract class JaxbOpenejb {
@SuppressWarnings({"unchecked"})
public static <T> T create(final Class<T> type) {
- if (type == null) throw new NullPointerException("type is null");
+ if (type == null) {
+ throw new NullPointerException("type is null");
+ }
if (type == ConnectionManager.class) {
return (T) createConnectionManager();
@@ -94,7 +96,9 @@ public abstract class JaxbOpenejb {
}
public static <T> T create(final String type) {
- if (type == null) throw new NullPointerException("type is null");
+ if (type == null) {
+ throw new NullPointerException("type is null");
+ }
if (type.equals("ConnectionManager")) {
return (T) createConnectionManager();
@@ -418,7 +422,9 @@ public abstract class JaxbOpenejb {
}
public void startElement(final String uri, final String localName, final String qName, final Attributes att) throws SAXException {
- if (!localName.equals("ServiceProvider")) return;
+ if (!localName.equals("ServiceProvider")) {
+ return;
+ }
provider = new ServiceProvider();
provider.setId(att.getValue("","id"));
@@ -437,12 +443,16 @@ public abstract class JaxbOpenejb {
}
public void characters(final char[] ch, final int start, final int length) throws SAXException {
- if (content == null) content = new StringBuilder();
+ if (content == null) {
+ content = new StringBuilder();
+ }
content.append(ch, start, length);
}
public void endElement(final String uri, final String localName, final String qName) throws SAXException {
- if (provider == null || content == null) return;
+ if (provider == null || content == null) {
+ return;
+ }
try {
provider.getProperties().putAll(propertiesAdapter.unmarshal(content.toString()));
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java Sat Feb 22 01:58:19 2014
@@ -32,7 +32,9 @@ public class PropertiesAdapter extends X
}
public String marshal(final Properties properties) throws Exception {
- if (properties == null) return null;
+ if (properties == null) {
+ return null;
+ }
final ByteArrayOutputStream out = new ByteArrayOutputStream();
properties.store(out, null);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java Sat Feb 22 01:58:19 2014
@@ -95,13 +95,21 @@ public class Resource extends AbstractSe
@Override
public boolean equals(final Object o) {
- if (this == o) return true;
- if (!(o instanceof Resource)) return false;
- if (!super.equals(o)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof Resource)) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
final Resource resource = (Resource) o;
- if (jndi != null ? !jndi.equals(resource.jndi) : resource.jndi != null) return false;
+ if (jndi != null ? !jndi.equals(resource.jndi) : resource.jndi != null) {
+ return false;
+ }
return true;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java Sat Feb 22 01:58:19 2014
@@ -66,18 +66,31 @@ class SaxOpenejb extends StackHandler {
@Override
public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
- if (localName.equals("Container")) push(new ContainerElement());
- else if (localName.equals("JndiProvider")) push(new JndiProviderElement());
- else if (localName.equals("SecurityService")) push(new SecurityServiceElement());
- else if (localName.equals("TransactionManager")) push(new TransactionManagerElement());
- else if (localName.equals("ConnectionManager")) push(new ConnectionManagerElement());
- else if (localName.equals("ProxyFactory")) push(new ProxyFactoryElement());
- else if (localName.equals("Resource")) push(new ResourceElement(openejb.getResource()));
- else if (localName.equals("Connector")) push(new ResourceElement(openejb.getResource()));
- else if (localName.equals("Deployments")) push(new DeploymentsElement());
- else if (localName.equals("Import")) push(new ImportElement());
- else if (localName.equals("Service")) push(new DeclaredServiceElement(openejb.getServices()));
- else throw new IllegalStateException("Unsupported Element: " + localName);
+ if (localName.equals("Container")) {
+ push(new ContainerElement());
+ } else if (localName.equals("JndiProvider")) {
+ push(new JndiProviderElement());
+ } else if (localName.equals("SecurityService")) {
+ push(new SecurityServiceElement());
+ } else if (localName.equals("TransactionManager")) {
+ push(new TransactionManagerElement());
+ } else if (localName.equals("ConnectionManager")) {
+ push(new ConnectionManagerElement());
+ } else if (localName.equals("ProxyFactory")) {
+ push(new ProxyFactoryElement());
+ } else if (localName.equals("Resource")) {
+ push(new ResourceElement(openejb.getResource()));
+ } else if (localName.equals("Connector")) {
+ push(new ResourceElement(openejb.getResource()));
+ } else if (localName.equals("Deployments")) {
+ push(new DeploymentsElement());
+ } else if (localName.equals("Import")) {
+ push(new ImportElement());
+ } else if (localName.equals("Service")) {
+ push(new DeclaredServiceElement(openejb.getServices()));
+ } else {
+ throw new IllegalStateException("Unsupported Element: " + localName);
+ }
get().startElement(uri, localName, qName, attributes);
}
}
@@ -87,9 +100,13 @@ class SaxOpenejb extends StackHandler {
@Override
public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
- if (localName.equals("openejb")) push(new Root());
- else if (localName.equals("tomee")) push(new Root());
- else throw new SAXException("Unsupported Element: " + localName);
+ if (localName.equals("openejb")) {
+ push(new Root());
+ } else if (localName.equals("tomee")) {
+ push(new Root());
+ } else {
+ throw new SAXException("Unsupported Element: " + localName);
+ }
checkAttributes(attributes);
}
}
@@ -123,7 +140,9 @@ class SaxOpenejb extends StackHandler {
public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
super.startElement(uri, localName, qName, attributes);
final String ctype = attributes.getValue("ctype");
- if (ctype != null) service.setType(ctype);
+ if (ctype != null) {
+ service.setType(ctype);
+ }
}
@Override
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java Sat Feb 22 01:58:19 2014
@@ -130,13 +130,27 @@ public class StackHandler extends Defaul
@Override
public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException{
- if (attributes.getValue("type") != null) service.setType(attributes.getValue("type"));
- if (attributes.getValue("jar") != null) service.setJar(attributes.getValue("jar"));
- if (attributes.getValue("provider") != null) service.setProvider(attributes.getValue("provider"));
- if (attributes.getValue("id") != null) service.setId(attributes.getValue("id"));
- if (attributes.getValue("class-name") != null) service.setClassName(attributes.getValue("class-name"));
- if (attributes.getValue("constructor") != null) service.setConstructor(attributes.getValue("constructor"));
- if (attributes.getValue("factory-name") != null) service.setFactoryName(attributes.getValue("factory-name"));
+ if (attributes.getValue("type") != null) {
+ service.setType(attributes.getValue("type"));
+ }
+ if (attributes.getValue("jar") != null) {
+ service.setJar(attributes.getValue("jar"));
+ }
+ if (attributes.getValue("provider") != null) {
+ service.setProvider(attributes.getValue("provider"));
+ }
+ if (attributes.getValue("id") != null) {
+ service.setId(attributes.getValue("id"));
+ }
+ if (attributes.getValue("class-name") != null) {
+ service.setClassName(attributes.getValue("class-name"));
+ }
+ if (attributes.getValue("constructor") != null) {
+ service.setConstructor(attributes.getValue("constructor"));
+ }
+ if (attributes.getValue("factory-name") != null) {
+ service.setFactoryName(attributes.getValue("factory-name"));
+ }
checkAttributes(attributes, getAttributes());
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java Sat Feb 22 01:58:19 2014
@@ -67,11 +67,21 @@ public class WikiGenerator {
private int grade(final ServiceProvider i) {
final String name = i.getClassName();
- if (name.contains("stateless")) return 10;
- if (name.contains("stateful")) return 9;
- if (name.contains("singleton")) return 8;
- if (name.contains("mdb")) return 7;
- if (name.contains("managed")) return 6;
+ if (name.contains("stateless")) {
+ return 10;
+ }
+ if (name.contains("stateful")) {
+ return 9;
+ }
+ if (name.contains("singleton")) {
+ return 8;
+ }
+ if (name.contains("mdb")) {
+ return 7;
+ }
+ if (name.contains("managed")) {
+ return 6;
+ }
return 0;
}
});
@@ -87,7 +97,9 @@ public class WikiGenerator {
for (final ServiceProvider provider : servicesJar.getServiceProvider()) {
if ("Resource".equals(provider.getService())) {
- if (seen.containsAll(provider.getTypes())) continue;
+ if (seen.containsAll(provider.getTypes())) {
+ continue;
+ }
generateService(provider, "Resource");
@@ -124,7 +136,9 @@ public class WikiGenerator {
final Map<String, String> attributes = properties.getAttributes(name);
- if (attributes.containsKey("hidden")) continue;
+ if (attributes.containsKey("hidden")) {
+ continue;
+ }
out.println("### " + key);
out.println();
@@ -137,7 +151,9 @@ public class WikiGenerator {
defaults.put(name, String.valueOf(value));
- if (comment.length() == 0) comment = "No description.";
+ if (comment.length() == 0) {
+ comment = "No description.";
+ }
out.println(comment);
out.println();
@@ -161,7 +177,9 @@ public class WikiGenerator {
}
private String scrubText(String text) {
- if (text == null) text = "";
+ if (text == null) {
+ text = "";
+ }
return text;
// text = text.replaceAll("\r?\n", "\\\\\\\\ ");
// text = text.replaceAll("\\*", "\\\\*");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ObjectMap.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ObjectMap.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ObjectMap.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ObjectMap.java Sat Feb 22 01:58:19 2014
@@ -56,8 +56,12 @@ public class ObjectMap extends AbstractM
for (final Method getter : clazz.getMethods()) {
try {
- if (getter.getName().startsWith("get")) continue;
- if (getter.getParameterTypes().length != 0) continue;
+ if (getter.getName().startsWith("get")) {
+ continue;
+ }
+ if (getter.getParameterTypes().length != 0) {
+ continue;
+ }
final String name = getter.getName().replaceFirst("get", "set");
@@ -77,14 +81,18 @@ public class ObjectMap extends AbstractM
@Override
public Object get(final Object key) {
final Entry<String, Object> entry = attributes.get(key);
- if (entry == null) return null;
+ if (entry == null) {
+ return null;
+ }
return entry.getValue();
}
@Override
public Object put(final String key, final Object value) {
final Entry<String, Object> entry = attributes.get(key);
- if (entry == null) return null;
+ if (entry == null) {
+ return null;
+ }
return entry.setValue(value);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java Sat Feb 22 01:58:19 2014
@@ -54,7 +54,9 @@ public class ProviderGenerator extends R
final String name = guessBuilder(types);
final String builder = name + "Builder";
- if (seen.contains(builder)) continue;
+ if (seen.contains(builder)) {
+ continue;
+ }
seen.add(builder);
final String service = provider.getService();
@@ -266,7 +268,9 @@ public class ProviderGenerator extends R
unit = TimeUnit.HOURS;
}
- if (unit == null) continue;
+ if (unit == null) {
+ continue;
+ }
final Pattern pattern = Pattern.compile("(millis(econds)?|seconds|minutes|hours)", Pattern.CASE_INSENSITIVE);
final String lcFirstKey2 = pattern.matcher(lcFirstKey).replaceAll("");
@@ -328,7 +332,9 @@ public class ProviderGenerator extends R
}
private static String asValue(final String type, final String value) {
- if ("".equals(value)) return "null";
+ if ("".equals(value)) {
+ return "null";
+ }
if ("String".equals(type)) {
return "\"" + value + "\"";
@@ -346,23 +352,43 @@ public class ProviderGenerator extends R
private static String guessBuilder(final List<String> types) {
String s = types.get(0);
- if ("STATEFUL".equals(s)) return "StatefulContainer";
- if ("SINGLETON".equals(s)) return "SingletonContainer";
- if ("MANAGED".equals(s)) return "ManagedContainer";
- if ("STATELESS".equals(s)) return "StatelessContainer";
- if ("MESSAGE".equals(s)) return "MessageDrivenContainer";
- if ("BMP_ENTITY".equals(s)) return "BmpEntityContainer";
- if ("CMP_ENTITY".equals(s)) return "CmpEntityContainer";
+ if ("STATEFUL".equals(s)) {
+ return "StatefulContainer";
+ }
+ if ("SINGLETON".equals(s)) {
+ return "SingletonContainer";
+ }
+ if ("MANAGED".equals(s)) {
+ return "ManagedContainer";
+ }
+ if ("STATELESS".equals(s)) {
+ return "StatelessContainer";
+ }
+ if ("MESSAGE".equals(s)) {
+ return "MessageDrivenContainer";
+ }
+ if ("BMP_ENTITY".equals(s)) {
+ return "BmpEntityContainer";
+ }
+ if ("CMP_ENTITY".equals(s)) {
+ return "CmpEntityContainer";
+ }
- if ("javax.jms.ConnectionFactory".equals(s)) return "JmsConnectionFactory";
- if ("javax.mail.Session".equals(s)) return "JavaMailSession";
+ if ("javax.jms.ConnectionFactory".equals(s)) {
+ return "JmsConnectionFactory";
+ }
+ if ("javax.mail.Session".equals(s)) {
+ return "JavaMailSession";
+ }
s = s.replaceAll(".*\\.", "");
return s;
}
private static String guessType(final String key, final String value) {
- if (value.equals("true") || value.equals("false")) return "boolean";
+ if (value.equals("true") || value.equals("false")) {
+ return "boolean";
+ }
if (key.toLowerCase().endsWith("timeout")) {
return Duration.class.getName();
@@ -433,7 +459,9 @@ public class ProviderGenerator extends R
while (matcher.find()) {
final String key = matcher.group(2);
- if (key == null) throw new IllegalStateException("Key is null. Template '" + template + "'");
+ if (key == null) {
+ throw new IllegalStateException("Key is null. Template '" + template + "'");
+ }
String value = map.get(key);
@@ -445,7 +473,9 @@ public class ProviderGenerator extends R
value = Strings.camelCase(map.get(key.substring(0, key.length() - 3)));
}
- if (value == null) throw new IllegalStateException("Value is null for key '" + key + "'. Template '" + template + "'. Keys: " + Join.join(", ", map.keySet()));
+ if (value == null) {
+ throw new IllegalStateException("Value is null for key '" + key + "'. Template '" + template + "'. Keys: " + Join.join(", ", map.keySet()));
+ }
matcher.appendReplacement(buf, value);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java Sat Feb 22 01:58:19 2014
@@ -97,7 +97,9 @@ public abstract class BaseContext implem
public Principal getCallerPrincipal() {
check(Call.getCallerPrincipal);
Principal callerPrincipal = getCallerPrincipal(securityService);
- if (callerPrincipal == null) callerPrincipal = UnauthenticatedPrincipal.INSTANCE;
+ if (callerPrincipal == null) {
+ callerPrincipal = UnauthenticatedPrincipal.INSTANCE;
+ }
return callerPrincipal;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java Sat Feb 22 01:58:19 2014
@@ -70,7 +70,9 @@ public abstract class BaseSessionContext
final ThreadContext threadContext = ThreadContext.getThreadContext();
final BeanContext di = threadContext.getBeanContext();
- if (di.getLocalHomeInterface() == null) throw new IllegalStateException("Bean does not have an EJBLocalObject interface: "+di.getDeploymentID());
+ if (di.getLocalHomeInterface() == null) {
+ throw new IllegalStateException("Bean does not have an EJBLocalObject interface: " + di.getDeploymentID());
+ }
return (EJBLocalObject) EjbObjectProxyHandler.createProxy(di, threadContext.getPrimaryKey(), InterfaceType.EJB_LOCAL, di.getLocalInterface());
}
@@ -79,7 +81,9 @@ public abstract class BaseSessionContext
check(Call.getEJBObject);
final ThreadContext threadContext = ThreadContext.getThreadContext();
final BeanContext di = threadContext.getBeanContext();
- if (di.getHomeInterface() == null) throw new IllegalStateException("Bean does not have an EJBObject interface: "+di.getDeploymentID());
+ if (di.getHomeInterface() == null) {
+ throw new IllegalStateException("Bean does not have an EJBObject interface: " + di.getDeploymentID());
+ }
return (EJBObject) EjbObjectProxyHandler.createProxy(di, threadContext.getPrimaryKey(), InterfaceType.EJB_OBJECT, di.getRemoteInterface());
}
@@ -88,13 +92,17 @@ public abstract class BaseSessionContext
check(Call.getMessageContext);
final ThreadContext threadContext = ThreadContext.getThreadContext();
final MessageContext messageContext = threadContext.get(MessageContext.class);
- if (messageContext == null) throw new IllegalStateException("Only calls on the service-endpoint have a MessageContext.");
+ if (messageContext == null) {
+ throw new IllegalStateException("Only calls on the service-endpoint have a MessageContext.");
+ }
return messageContext;
}
public Object getBusinessObject(final Class interfce) {
check(Call.getBusinessObject);
- if (interfce == null) throw new IllegalStateException("Interface argument cannot me null.");
+ if (interfce == null) {
+ throw new IllegalStateException("Interface argument cannot me null.");
+ }
final ThreadContext threadContext = ThreadContext.getThreadContext();
final BeanContext di = threadContext.getBeanContext();
@@ -161,7 +169,9 @@ public abstract class BaseSessionContext
final ThreadContext threadContext = ThreadContext.getThreadContext();
final Class invokedInterface = threadContext.getInvokedInterface();
final InterfaceType type = threadContext.getBeanContext().getInterfaceType(invokedInterface);
- if (!type.isBusiness()) throw new IllegalStateException("The EJB spec requires us to cripple the use of this method for anything but business interface proxy. But FYI, your invoked interface is: "+invokedInterface.getName());
+ if (!type.isBusiness()) {
+ throw new IllegalStateException("The EJB spec requires us to cripple the use of this method for anything but business interface proxy. But FYI, your invoked interface is: " + invokedInterface.getName());
+ }
if (invokedInterface == null){
throw new IllegalStateException("Business interface not set into ThreadContext.");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java Sat Feb 22 01:58:19 2014
@@ -81,7 +81,9 @@ public class TempClassLoader extends URL
@Override
protected synchronized Class loadClass(final String name, final boolean resolve) throws ClassNotFoundException {
- if (name == null) throw new NullPointerException("name cannot be null");
+ if (name == null) {
+ throw new NullPointerException("name cannot be null");
+ }
// see if we've already loaded it
Class c = this.findLoadedClass(name);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java Sat Feb 22 01:58:19 2014
@@ -58,7 +58,9 @@ public class WebContext {
private final Map<Class<?>, ConstructorInjectionBean<Object>> constructorInjectionBeanCache = new ConcurrentHashMap<Class<?>, ConstructorInjectionBean<Object>>();
public Context getInitialContext() {
- if (initialContext != null) return initialContext;
+ if (initialContext != null) {
+ return initialContext;
+ }
try {
initialContext = (Context) new InitialContext().lookup("java:");
} catch (final NamingException e) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/AbstractKeyGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/AbstractKeyGenerator.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/AbstractKeyGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/AbstractKeyGenerator.java Sat Feb 22 01:58:19 2014
@@ -37,8 +37,12 @@ public abstract class AbstractKeyGenerat
}
public static Object getFieldValue(final Field field, final Object object) throws EJBException {
- if (field == null) throw new NullPointerException("field is null");
- if (object == null) throw new NullPointerException("object is null");
+ if (field == null) {
+ throw new NullPointerException("field is null");
+ }
+ if (object == null) {
+ throw new NullPointerException("object is null");
+ }
try {
return field.get(object);
} catch (final Exception e) {
@@ -47,8 +51,12 @@ public abstract class AbstractKeyGenerat
}
public static void setFieldValue(final Field field, final Object object, final Object value) throws EJBException {
- if (field == null) throw new NullPointerException("field is null");
- if (object == null) throw new NullPointerException("object is null");
+ if (field == null) {
+ throw new NullPointerException("field is null");
+ }
+ if (object == null) {
+ throw new NullPointerException("object is null");
+ }
try {
field.set(object, value);
} catch (final Exception e) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java Sat Feb 22 01:58:19 2014
@@ -254,13 +254,27 @@ public class Cmp2Generator implements Op
// spec, the bean author should be responsble for these, but since these
// are frequently just nop stubs, we'll take responsibility for creating
// empty ones in the generated superclass.
- if (!hasMethod(beanClass, "ejbActivate")) createEjbActivate();
- if (!hasMethod(beanClass, "ejbPassivate")) createEjbPassivate();
- if (!hasMethod(beanClass, "ejbLoad")) createEjbLoad();
- if (!hasMethod(beanClass, "ejbStore")) createEjbStore();
- if (!hasMethod(beanClass, "ejbRemove")) createEjbRemove();
- if (!hasMethod(beanClass, "setEntityContext", EntityContext.class)) createSetEntityContext();
- if (!hasMethod(beanClass, "unsetEntityContext")) createUnsetEntityContext();
+ if (!hasMethod(beanClass, "ejbActivate")) {
+ createEjbActivate();
+ }
+ if (!hasMethod(beanClass, "ejbPassivate")) {
+ createEjbPassivate();
+ }
+ if (!hasMethod(beanClass, "ejbLoad")) {
+ createEjbLoad();
+ }
+ if (!hasMethod(beanClass, "ejbStore")) {
+ createEjbStore();
+ }
+ if (!hasMethod(beanClass, "ejbRemove")) {
+ createEjbRemove();
+ }
+ if (!hasMethod(beanClass, "setEntityContext", EntityContext.class)) {
+ createSetEntityContext();
+ }
+ if (!hasMethod(beanClass, "unsetEntityContext")) {
+ createUnsetEntityContext();
+ }
// add on any post-create methods that might be required.
postCreateGenerator.generate();
@@ -1047,7 +1061,9 @@ public class Cmp2Generator implements Op
signature.append('(');
boolean first = true;
for (final Class<?> parameterType : selectMethod.getParameterTypes()) {
- if (!first) signature.append(',');
+ if (!first) {
+ signature.append(',');
+ }
signature.append(parameterType.getCanonicalName());
first = false;
}
@@ -1141,8 +1157,9 @@ public class Cmp2Generator implements Op
} else {
final Convert conversion = getConversion(to);
{
- if (conversion == null)
+ if (conversion == null) {
throw new NullPointerException("unsupported conversion for EJB select return type " + to.getName());
+ }
}
conversion.objectToPrimitive(mv);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java Sat Feb 22 01:58:19 2014
@@ -30,7 +30,9 @@ import java.lang.reflect.Field;
public class Cmp2Util {
public static Object getPrimaryKey(final BeanContext beanContext, final EntityBean entity){
- if (entity == null) return null;
+ if (entity == null) {
+ return null;
+ }
// build the primary key
final KeyGenerator kg = beanContext.getKeyGenerator();
@@ -39,7 +41,9 @@ public class Cmp2Util {
}
public static <Bean extends EntityBean> Bean getEntityBean(final EJBLocalObject proxy) {
- if (proxy == null) return null;
+ if (proxy == null) {
+ return null;
+ }
final EjbObjectProxyHandler handler = (EjbObjectProxyHandler) ProxyManager.getInvocationHandler(proxy);
if (handler.container == null) {
@@ -54,7 +58,9 @@ public class Cmp2Util {
}
public static <Bean extends EntityBean> Bean getEntityBean(final EJBObject proxy) {
- if (proxy == null) return null;
+ if (proxy == null) {
+ return null;
+ }
final EjbObjectProxyHandler handler = (EjbObjectProxyHandler) ProxyManager.getInvocationHandler(proxy);
if (handler.container == null) {
@@ -69,7 +75,9 @@ public class Cmp2Util {
}
public static <Proxy extends EJBLocalObject> Proxy getEjbProxy(final BeanContext beanContext, final EntityBean entity){
- if (entity == null) return null;
+ if (entity == null) {
+ return null;
+ }
// build the primary key
final Object primaryKey = getPrimaryKey(beanContext, entity);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java Sat Feb 22 01:58:19 2014
@@ -114,7 +114,9 @@ public class CmrSet<Bean extends EntityB
final boolean changed = getRelatedBeans(true, true).add(newEntity);
if (changed && relatedProperty != null) {
// set the back reference in the new related bean
- if (source == null) throw new IllegalStateException("source is null");
+ if (source == null) {
+ throw new IllegalStateException("source is null");
+ }
final Object oldBackRef = toCmp2Entity(newEntity).OpenEJB_addCmr(relatedProperty, source);
// if the new related beas was related to another bean, we need
@@ -189,21 +191,27 @@ public class CmrSet<Bean extends EntityB
}
private Proxy getEjbProxy(final Bean entity) throws EJBException {
- if (entity == null) return null;
+ if (entity == null) {
+ return null;
+ }
final Proxy ejbProxy = Cmp2Util.<Proxy>getEjbProxy(relatedInfo, entity);
return ejbProxy;
}
private Bean getEntityBean(final EJBLocalObject proxy) {
- if (proxy == null) return null;
+ if (proxy == null) {
+ return null;
+ }
final Bean bean = Cmp2Util.<Bean>getEntityBean(proxy);
return bean;
}
private static <Bean extends EntityBean> Set<Bean> getEntityBeans(final Collection<?> proxies, final Class type) {
- if (proxies == null) return null;
+ if (proxies == null) {
+ return null;
+ }
final Set<Bean> entities = new HashSet<Bean>();
for (final Object value : proxies) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java Sat Feb 22 01:58:19 2014
@@ -39,8 +39,12 @@ public class SetValuedCmr<Bean extends E
private final TransactionSynchronizationRegistry transactionRegistry;
public SetValuedCmr(final EntityBean source, final String sourceProperty, final Class<Bean> relatedType, final String relatedProperty) {
- if (source == null) throw new NullPointerException("source is null");
- if (relatedType == null) throw new NullPointerException("relatedType is null");
+ if (source == null) {
+ throw new NullPointerException("source is null");
+ }
+ if (relatedType == null) {
+ throw new NullPointerException("relatedType is null");
+ }
this.source = source;
this.sourceProperty = sourceProperty;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SingleValuedCmr.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SingleValuedCmr.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SingleValuedCmr.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SingleValuedCmr.java Sat Feb 22 01:58:19 2014
@@ -32,8 +32,12 @@ public class SingleValuedCmr<Bean extend
private final BeanContext relatedInfo;
public SingleValuedCmr(final EntityBean source, final String sourceProperty, final Class<Bean> relatedType, final String relatedProperty) {
- if (source == null) throw new NullPointerException("source is null");
- if (relatedType == null) throw new NullPointerException("relatedType is null");
+ if (source == null) {
+ throw new NullPointerException("source is null");
+ }
+ if (relatedType == null) {
+ throw new NullPointerException("relatedType is null");
+ }
this.source = source;
this.sourceProperty = sourceProperty;
this.relatedProperty = relatedProperty;
@@ -47,7 +51,9 @@ public class SingleValuedCmr<Bean extend
"this entity does not have a cmr field for the relationship");
}
- if (entity == null) return null;
+ if (entity == null) {
+ return null;
+ }
final Proxy ejbProxy = Cmp2Util.<Proxy>getEjbProxy(relatedInfo, entity);
return ejbProxy;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java Sat Feb 22 01:58:19 2014
@@ -213,7 +213,9 @@ public class JpaCmpEngine implements Cmp
queryName.append('(');
boolean first = true;
for (final Class<?> parameterType : queryMethod.getParameterTypes()) {
- if (!first) queryName.append(',');
+ if (!first) {
+ queryName.append(',');
+ }
queryName.append(parameterType.getCanonicalName());
first = false;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java Sat Feb 22 01:58:19 2014
@@ -142,7 +142,9 @@ public class EntityEjbHomeHandler extend
}
private static String lcfirst(final String s){
- if (s == null || s.length() < 1) return s;
+ if (s == null || s.length() < 1) {
+ return s;
+ }
final StringBuilder sb = new StringBuilder(s);
sb.setCharAt(0, Character.toLowerCase(sb.charAt(0)));
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java Sat Feb 22 01:58:19 2014
@@ -113,8 +113,12 @@ public class EntityEjbObjectHandler exte
private final Object primaryKey;
public RegistryId(final Container container, final Object deploymentId, final Object primaryKey) {
- if (container == null) throw new NullPointerException("container is null");
- if (deploymentId == null) throw new NullPointerException("deploymentId is null");
+ if (container == null) {
+ throw new NullPointerException("container is null");
+ }
+ if (deploymentId == null) {
+ throw new NullPointerException("deploymentId is null");
+ }
this.containerId = container.getContainerID();
this.deploymentId = deploymentId;
@@ -122,8 +126,12 @@ public class EntityEjbObjectHandler exte
}
public boolean equals(final Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
final RegistryId that = (RegistryId) o;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java Sat Feb 22 01:58:19 2014
@@ -184,7 +184,9 @@ public class EntityInstanceManager {
protected EntityBean getPooledInstance(final ThreadContext callContext) throws OpenEJBException {
final BeanContext beanContext = callContext.getBeanContext();
final Stack methodReadyPool = poolMap.get(beanContext.getDeploymentID());
- if (methodReadyPool == null) throw new SystemException("Invalid deployment id " + beanContext.getDeploymentID() + " for this container");
+ if (methodReadyPool == null) {
+ throw new SystemException("Invalid deployment id " + beanContext.getDeploymentID() + " for this container");
+ }
EntityBean bean = (EntityBean) methodReadyPool.pop();
if (bean == null) {
@@ -434,16 +436,24 @@ public class EntityInstanceManager {
private final Object primaryKey;
public Key(final Object deploymentId, final Object primaryKey) {
- if (deploymentId == null) throw new NullPointerException("deploymentId is null");
- if (primaryKey == null) throw new NullPointerException("primaryKey is null");
+ if (deploymentId == null) {
+ throw new NullPointerException("deploymentId is null");
+ }
+ if (primaryKey == null) {
+ throw new NullPointerException("primaryKey is null");
+ }
this.deploymentId = deploymentId;
this.primaryKey = primaryKey;
}
public boolean equals(final Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
final Key key = (Key) o;
@@ -480,11 +490,21 @@ public class EntityInstanceManager {
private final TransactionPolicy txPolicy;
public SynchronizationWrapper(final BeanContext beanContext, final Object primaryKey, final EntityBean bean, final boolean available, final Key readyPoolKey, final TransactionPolicy txPolicy) {
- if (bean == null) throw new IllegalArgumentException("bean is null");
- if (readyPoolKey == null) throw new IllegalArgumentException("key is null");
- if (beanContext == null) throw new IllegalArgumentException("deploymentInfo is null");
- if (primaryKey == null) throw new IllegalArgumentException("primaryKey is null");
- if (txPolicy == null) throw new IllegalArgumentException("txEnv is null");
+ if (bean == null) {
+ throw new IllegalArgumentException("bean is null");
+ }
+ if (readyPoolKey == null) {
+ throw new IllegalArgumentException("key is null");
+ }
+ if (beanContext == null) {
+ throw new IllegalArgumentException("deploymentInfo is null");
+ }
+ if (primaryKey == null) {
+ throw new IllegalArgumentException("primaryKey is null");
+ }
+ if (txPolicy == null) {
+ throw new IllegalArgumentException("txEnv is null");
+ }
this.beanContext = beanContext;
this.bean = bean;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntrancyTracker.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntrancyTracker.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntrancyTracker.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntrancyTracker.java Sat Feb 22 01:58:19 2014
@@ -102,8 +102,12 @@ public class EntrancyTracker {
}
public boolean equals(final Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
final InstanceKey that = (InstanceKey) o;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/Interceptor.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/Interceptor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/Interceptor.java Sat Feb 22 01:58:19 2014
@@ -26,8 +26,12 @@ public class Interceptor {
private final Method method;
public Interceptor(final Object instance, final Method method) {
- if (instance == null) throw new NullPointerException("instance is null");
- if (method == null) throw new NullPointerException("method is null");
+ if (instance == null) {
+ throw new NullPointerException("instance is null");
+ }
+ if (method == null) {
+ throw new NullPointerException("method is null");
+ }
this.instance = instance;
this.method = method;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java Sat Feb 22 01:58:19 2014
@@ -125,12 +125,18 @@ public class InterceptorData {
}
public boolean equals(final Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
final InterceptorData that = (InterceptorData) o;
- if (clazz != null ? !clazz.equals(that.clazz) : that.clazz != null) return false;
+ if (clazz != null ? !clazz.equals(that.clazz) : that.clazz != null) {
+ return false;
+ }
return true;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorStack.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorStack.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorStack.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorStack.java Sat Feb 22 01:58:19 2014
@@ -37,8 +37,12 @@ public class InterceptorStack {
private final Operation operation;
public InterceptorStack(final Object beanInstance, final Method targetMethod, final Operation operation, final List<InterceptorData> interceptorDatas, final Map<String, Object> interceptorInstances) {
- if (interceptorDatas == null) throw new NullPointerException("interceptorDatas is null");
- if (interceptorInstances == null) throw new NullPointerException("interceptorInstances is null");
+ if (interceptorDatas == null) {
+ throw new NullPointerException("interceptorDatas is null");
+ }
+ if (interceptorInstances == null) {
+ throw new NullPointerException("interceptorInstances is null");
+ }
this.beanInstance = beanInstance;
this.targetMethod = targetMethod;
this.operation = operation;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.java Sat Feb 22 01:58:19 2014
@@ -41,9 +41,15 @@ public class ReflectionInvocationContext
private final Operation operation;
public ReflectionInvocationContext(final Operation operation, final List<Interceptor> interceptors, final Object target, final Method method, final Object... parameters) {
- if (operation == null) throw new NullPointerException("operation is null");
- if (interceptors == null) throw new NullPointerException("interceptors is null");
- if (target == null) throw new NullPointerException("target is null");
+ if (operation == null) {
+ throw new NullPointerException("operation is null");
+ }
+ if (interceptors == null) {
+ throw new NullPointerException("interceptors is null");
+ }
+ if (target == null) {
+ throw new NullPointerException("target is null");
+ }
this.operation = operation;
this.interceptors = interceptors.iterator();
@@ -98,7 +104,9 @@ public class ReflectionInvocationContext
if (operation.isCallback() && !operation.equals(Operation.TIMEOUT)) {
throw new IllegalStateException(getIllegalParameterAccessMessage());
}
- if (parameters == null) throw new IllegalArgumentException("parameters is null");
+ if (parameters == null) {
+ throw new IllegalArgumentException("parameters is null");
+ }
if (parameters.length != this.parameters.length) {
throw new IllegalArgumentException("Expected " + this.parameters.length + " parameters, but only got " + parameters.length + " parameters");
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java Sat Feb 22 01:58:19 2014
@@ -36,14 +36,30 @@ public class EjbObjectInputStream extend
return Class.forName(classDesc.getName(), false, getClassloader());
} catch (final ClassNotFoundException e) {
final String n = classDesc.getName();
- if (n.equals("boolean")) return boolean.class;
- if (n.equals("byte")) return byte.class;
- if (n.equals("char")) return char.class;
- if (n.equals("short")) return short.class;
- if (n.equals("int")) return int.class;
- if (n.equals("long")) return long.class;
- if (n.equals("float")) return float.class;
- if (n.equals("double")) return double.class;
+ if (n.equals("boolean")) {
+ return boolean.class;
+ }
+ if (n.equals("byte")) {
+ return byte.class;
+ }
+ if (n.equals("char")) {
+ return char.class;
+ }
+ if (n.equals("short")) {
+ return short.class;
+ }
+ if (n.equals("int")) {
+ return int.class;
+ }
+ if (n.equals("long")) {
+ return long.class;
+ }
+ if (n.equals("float")) {
+ return float.class;
+ }
+ if (n.equals("double")) {
+ return double.class;
+ }
return getClass().getClassLoader().loadClass(classDesc.getName()); // if CCL is not correct
}
@@ -51,8 +67,9 @@ public class EjbObjectInputStream extend
protected Class resolveProxyClass(final String[] interfaces) throws IOException, ClassNotFoundException {
final Class[] cinterfaces = new Class[interfaces.length];
- for (int i = 0; i < interfaces.length; i++)
+ for (int i = 0; i < interfaces.length; i++) {
cinterfaces[i] = getClassloader().loadClass(interfaces[i]);
+ }
try {
return Proxy.getProxyClass(getClassloader(), cinterfaces);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmArtifact.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmArtifact.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmArtifact.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmArtifact.java Sat Feb 22 01:58:19 2014
@@ -80,7 +80,9 @@ public class IntraVmArtifact implements
protected Object readResolve() throws ObjectStreamException {
final Handles handles = getHandles(staticArtifact);
final Object artifact = handles.get(instanceHandle);
- if (artifact == null) throw new InvalidObjectException(NO_ARTIFACT_ERROR + instanceHandle);
+ if (artifact == null) {
+ throw new InvalidObjectException(NO_ARTIFACT_ERROR + instanceHandle);
+ }
return artifact;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java Sat Feb 22 01:58:19 2014
@@ -65,10 +65,11 @@ public class IntraVmMetaData implements
}
public Class getPrimaryKeyClass() {
- if (type.isEntity())
+ if (type.isEntity()) {
return keyClass;
- else
+ } else {
throw new UnsupportedOperationException("Session objects are private resources and do not have primary keys");
+ }
}
public boolean isSession() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java Sat Feb 22 01:58:19 2014
@@ -91,10 +91,11 @@ public class IvmContext implements Conte
public IvmContext(final Hashtable<String, Object> environment) throws NamingException {
this();
- if (environment == null)
+ if (environment == null) {
throw new NamingException("Invalid Argument");
- else
+ } else {
myEnv = (Hashtable<String, Object>) environment.clone();
+ }
}
@@ -159,9 +160,9 @@ public class IvmContext implements Conte
throw new NameNotFoundException("Name \"" + compositName + "\" not found.");
}
- if (obj.getClass() == IvmContext.class)
+ if (obj.getClass() == IvmContext.class) {
((IvmContext) obj).myEnv = myEnv;
- else if (obj instanceof Reference) {
+ } else if (obj instanceof Reference) {
/**
* EJB references and resource references are wrapped in special
* org.apache.openejb.core.ivm.naming.Reference types that check to
@@ -184,10 +185,11 @@ public class IvmContext implements Conte
final CompositeName name = new CompositeName(compositName);
final Object obj = factory.getObjectInstance(null, name, null, null);
- if (obj instanceof Context)
+ if (obj instanceof Context) {
return ((Context) obj).lookup(compositName);
- else if (obj != null)
+ } else if (obj != null) {
return obj;
+ }
} catch (final Exception doNothing) {
// no-op
}
@@ -208,8 +210,9 @@ public class IvmContext implements Conte
for (final StringTokenizer tokenizer = new StringTokenizer(urlPackagePrefixes, ":"); tokenizer.hasMoreTokens();) {
final String urlPackagePrefix = tokenizer.nextToken();
final String className = urlPackagePrefix + ".java.javaURLContextFactory";
- if (className.equals("org.apache.openejb.core.ivm.naming.java.javaURLContextFactory"))
+ if (className.equals("org.apache.openejb.core.ivm.naming.java.javaURLContextFactory")) {
continue;
+ }
try {
final ClassLoader cl = ClassLoaderUtil.getContextClassLoader();
final Class factoryClass = Class.forName(className, true, cl);
@@ -238,7 +241,9 @@ public class IvmContext implements Conte
// 2. Thread.currentThread().getContextClassLoader().getResources("jndi.properties")
if (urlPackagePrefixes == null) {
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- if (classLoader == null) classLoader = ClassLoader.getSystemClassLoader();
+ if (classLoader == null) {
+ classLoader = ClassLoader.getSystemClassLoader();
+ }
try {
final Enumeration<URL> resources = classLoader.getResources("jndi.properties");
@@ -295,9 +300,9 @@ public class IvmContext implements Conte
*/
name = name.substring(indx + 1);
}
- if (fastCache.containsKey(name))
+ if (fastCache.containsKey(name)) {
throw new NameAlreadyBoundException();
- else {
+ } else {
final ParsedName parsedName = new ParsedName(name);
mynode.bind(parsedName, obj);
}
@@ -359,9 +364,9 @@ public class IvmContext implements Conte
public NamingEnumeration<NameClassPair> list(final String name) throws NamingException {
final Object obj = lookup(name);
- if (obj.getClass() == IvmContext.class)
+ if (obj.getClass() == IvmContext.class) {
return new MyListEnumeration(((IvmContext) obj).mynode);
- else {
+ } else {
return null;
}
}
@@ -372,9 +377,9 @@ public class IvmContext implements Conte
public NamingEnumeration<Binding> listBindings(final String name) throws NamingException {
final Object obj = lookup(name);
- if (obj.getClass() == IvmContext.class)
+ if (obj.getClass() == IvmContext.class) {
return new MyBindingEnumeration(((IvmContext) obj).mynode);
- else {
+ } else {
return null;
}
}
@@ -401,10 +406,11 @@ public class IvmContext implements Conte
*/
name = name.substring(indx + 1);
}
- if (fastCache.containsKey(name))
+ if (fastCache.containsKey(name)) {
throw new NameAlreadyBoundException();
- else
+ } else {
return mynode.createSubcontext(new ParsedName(name));
+ }
}
public Context createSubcontext(final Name name) throws NamingException {
@@ -447,8 +453,9 @@ public class IvmContext implements Conte
}
public Object removeFromEnvironment(final String propName) throws NamingException {
- if (myEnv == null)
+ if (myEnv == null) {
return null;
+ }
return myEnv.remove(propName);
}
@@ -469,7 +476,9 @@ public class IvmContext implements Conte
}
protected void checkReadOnly() throws OperationNotSupportedException {
- if (readOnly) throw new OperationNotSupportedException();
+ if (readOnly) {
+ throw new OperationNotSupportedException();
+ }
}
protected class MyBindingEnumeration extends MyNamingEnumeration {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java Sat Feb 22 01:58:19 2014
@@ -55,7 +55,9 @@ public class IvmJndiFactory implements J
for (final Map.Entry<String, Object> entry: bindings.entrySet()) {
final String name = entry.getKey();
final Object value = entry.getValue();
- if (value == null) continue;
+ if (value == null) {
+ continue;
+ }
try {
context.bind(name, value);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java Sat Feb 22 01:58:19 2014
@@ -52,8 +52,9 @@ public class JndiEncArtifact implements
final Context cntx = deployment.getJndiEnc();
try {
final Object obj = cntx.lookup(path);
- if (obj == null)
+ if (obj == null) {
throw new InvalidObjectException("JNDI ENC context reference could not be properly resolved when bean instance was activated");
+ }
return obj;
} catch (final NamingException e) {
throw (InvalidObjectException)new InvalidObjectException("JNDI ENC context reference could not be properly resolved due to a JNDI exception, when bean instance was activated").initCause(e);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java Sat Feb 22 01:58:19 2014
@@ -42,9 +42,9 @@ public class NameNode implements Seriali
atomicHash = name.getComponentHashCode();
this.parent = parent;
this.parentTree = parentTree;
- if (name.next())
+ if (name.next()) {
subTree = new NameNode(this, name, obj, this);
- else if (obj instanceof Context) {
+ } else if (obj instanceof Context) {
myObject = new Federation();
((Federation)myObject).add((Context) obj);
} else {
@@ -57,11 +57,12 @@ public class NameNode implements Seriali
}
public Object getBinding() {
- if (myObject != null && !(myObject instanceof Federation))
+ if (myObject != null && !(myObject instanceof Federation)) {
return myObject;// if NameNode has an object it must be a binding
- else {
- if (myContext == null)
+ } else {
+ if (myContext == null) {
myContext = new IvmContext(this);
+ }
return myContext;
}
}
@@ -119,7 +120,9 @@ public class NameNode implements Seriali
return new IvmContext(node);
}
}
- if (n != null) throw n;
+ if (n != null) {
+ throw n;
+ }
throw new NameNotFoundException("Cannot resolve " + name);
}
@@ -130,10 +133,11 @@ public class NameNode implements Seriali
if (myObject != null && !(myObject instanceof Federation)) {
throw new NameAlreadyBoundException();
}
- if (subTree == null)
+ if (subTree == null) {
subTree = new NameNode(this, name, obj, this);
- else
+ } else {
subTree.bind(name, obj);
+ }
} else {
if (obj instanceof Context) {
if (myObject != null) {
@@ -156,16 +160,18 @@ public class NameNode implements Seriali
}
}
} else if (compareResult == ParsedName.IS_LESS) {
- if (lessTree == null)
+ if (lessTree == null) {
lessTree = new NameNode(this.parent, name, obj, this);
- else
+ } else {
lessTree.bind(name, obj);
+ }
} else {
//ParsedName.IS_GREATER ...
- if (grtrTree == null)
+ if (grtrTree == null) {
grtrTree = new NameNode(this.parent, name, obj, this);
- else
+ } else {
grtrTree.bind(name, obj);
+ }
}
}
@@ -188,12 +194,13 @@ public class NameNode implements Seriali
public int compareTo(final int otherHash) {
- if (atomicHash == otherHash)
+ if (atomicHash == otherHash) {
return 0;
- else if (atomicHash > otherHash)
+ } else if (atomicHash > otherHash) {
return 1;
- else
+ } else {
return -1;
+ }
}
private void bind(final NameNode node) {
@@ -254,8 +261,9 @@ public class NameNode implements Seriali
}
} else {//ParsedName.IS_GREATER ...
- if (grtrTree != null)
+ if (grtrTree != null) {
grtrTree.unbind(name);
+ }
}
}
@@ -297,7 +305,9 @@ public class NameNode implements Seriali
grtrTree.prune(until);
}
- if (this == until) return;
+ if (this == until) {
+ return;
+ }
if (!hasChildren() && myObject == null){
parentTree.unbind(this);
@@ -309,9 +319,15 @@ public class NameNode implements Seriali
}
private boolean hasChildren(final NameNode node) {
- if (subTree != null && subTree.hasChildren(node)) return true;
- if (grtrTree != null && grtrTree.hasChildren(node)) return true;
- if (lessTree != null && lessTree.hasChildren(node)) return true;
+ if (subTree != null && subTree.hasChildren(node)) {
+ return true;
+ }
+ if (grtrTree != null && grtrTree.hasChildren(node)) {
+ return true;
+ }
+ if (lessTree != null && lessTree.hasChildren(node)) {
+ return true;
+ }
return parent == node;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java Sat Feb 22 01:58:19 2014
@@ -39,8 +39,9 @@ public class ParsedName implements Seria
} else if (path.length() > 0) {
final StringTokenizer st = new StringTokenizer(path, "/");
components = new String[st.countTokens()];
- for (int i = 0; st.hasMoreTokens() && i < components.length; i++)
+ for (int i = 0; st.hasMoreTokens() && i < components.length; i++) {
components[i] = st.nextToken();
+ }
hashcode = components[0].hashCode();
} else {
@@ -72,18 +73,21 @@ public class ParsedName implements Seria
}
public void reset(final int pos) {
- if (pos < 0 || pos >= components.length) throw new IllegalArgumentException("pos out of range 0 to " + components.length);
+ if (pos < 0 || pos >= components.length) {
+ throw new IllegalArgumentException("pos out of range 0 to " + components.length);
+ }
this.pos = pos;
hashcode = components[pos].hashCode();
}
public int compareTo(final int otherHash) {
- if (hashcode == otherHash)
+ if (hashcode == otherHash) {
return 0;
- else if (hashcode > otherHash)
+ } else if (hashcode > otherHash) {
return 1;
- else
+ } else {
return -1;
+ }
}
public int getComponentHashCode() {
@@ -98,13 +102,17 @@ public class ParsedName implements Seria
public static void main(final String [] args) {
final ParsedName name = new ParsedName("comp/env/jdbc/mydatabase");
- while (name.next()) System.out.println(name.getComponent());
+ while (name.next()) {
+ System.out.println(name.getComponent());
+ }
}
public ParsedName remaining() {
final ParsedName name = new ParsedName("");
final int next = pos +1;
- if (next > components.length) return name;
+ if (next > components.length) {
+ return name;
+ }
final String[] dest = new String[components.length - next];
System.arraycopy(components, next, dest, 0, dest.length);
@@ -139,16 +147,26 @@ with a slash. It may be the empty strin
/* Normalize the given pathname, whose length is len, starting at the given
offset; everything before this offset is already normal. */
private String normalize(final String pathname, final int len, final int off) {
- if (len == 0) return pathname;
+ if (len == 0) {
+ return pathname;
+ }
int n = len;
- while (n > 0 && pathname.charAt(n - 1) == '/') n--;
- if (n == 0) return "/";
+ while (n > 0 && pathname.charAt(n - 1) == '/') {
+ n--;
+ }
+ if (n == 0) {
+ return "/";
+ }
final StringBuilder sb = new StringBuilder(pathname.length());
- if (off > 0) sb.append(pathname.substring(0, off));
+ if (off > 0) {
+ sb.append(pathname.substring(0, off));
+ }
char prevChar = 0;
for (int i = off; i < n; i++) {
final char c = pathname.charAt(i);
- if (prevChar == '/' && c == '/') continue;
+ if (prevChar == '/' && c == '/') {
+ continue;
+ }
sb.append(c);
prevChar = c;
}
@@ -163,11 +181,14 @@ with a slash. It may be the empty strin
char prevChar = 0;
for (int i = 0; i < n; i++) {
final char c = pathname.charAt(i);
- if (prevChar == '/' && c == '/')
+ if (prevChar == '/' && c == '/') {
return normalize(pathname, n, i - 1);
+ }
prevChar = c;
}
- if (prevChar == '/') return normalize(pathname, n, n - 1);
+ if (prevChar == '/') {
+ return normalize(pathname, n, n - 1);
+ }
return pathname;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/SystemComponentReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/SystemComponentReference.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/SystemComponentReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/SystemComponentReference.java Sat Feb 22 01:58:19 2014
@@ -28,7 +28,9 @@ public class SystemComponentReference ex
private final Class<? extends Object> type;
public SystemComponentReference(final Class<? extends Object> type) {
- if (type == null) throw new NullPointerException("type is null");
+ if (type == null) {
+ throw new NullPointerException("type is null");
+ }
this.type = type;
}