Skip to content
Snippets Groups Projects
Commit e8e3f3a3 authored by Tomasz Grabiec's avatar Tomasz Grabiec
Browse files

java: apply coding style

Auto reformat performed from IntelliJ (alt+ctrl+L)
parent f3df4180
No related branches found
No related tags found
No related merge requests found
...@@ -105,29 +105,29 @@ public class ContextIsolator { ...@@ -105,29 +105,29 @@ public class ContextIsolator {
ArrayList<String> classpath = new ArrayList<String>(); ArrayList<String> classpath = new ArrayList<String>();
for (int i = 0; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
if (args[i].equals("-jar")) { if (args[i].equals("-jar")) {
if (i+1 >= args.length) { if (i + 1 >= args.length) {
System.err.println("RunJava: Missing jar name after '-jar'."); System.err.println("RunJava: Missing jar name after '-jar'.");
return null; return null;
} }
return runJar(args[i+1], java.util.Arrays.copyOfRange(args, i+2, args.length), classpath); return runJar(args[i + 1], java.util.Arrays.copyOfRange(args, i + 2, args.length), classpath);
} else if (args[i].equals("-classpath") || args[i].equals("-cp")) { } else if (args[i].equals("-classpath") || args[i].equals("-cp")) {
if (i+1 >= args.length) { if (i + 1 >= args.length) {
System.err.println("RunJava: Missing parameter after '"+args[i]+"'"); System.err.println("RunJava: Missing parameter after '" + args[i] + "'");
return null; return null;
} }
for (String c : expandClassPath(args[i+1])) { for (String c : expandClassPath(args[i + 1])) {
classpath.add(c); classpath.add(c);
} }
i++; i++;
} else if (args[i].startsWith("-D")) { } else if (args[i].startsWith("-D")) {
int eq = args[i].indexOf('='); int eq = args[i].indexOf('=');
if (eq<0) { if (eq < 0) {
System.err.println("RunJava: Missing '=' in parameter '"+args[i]+"'"); System.err.println("RunJava: Missing '=' in parameter '" + args[i] + "'");
return null; return null;
} }
String key = args[i].substring(2, eq); String key = args[i].substring(2, eq);
String value = args[i].substring(eq+1, args[i].length()); String value = args[i].substring(eq + 1, args[i].length());
System.setProperty(key, value); System.setProperty(key, value);
} else if (args[i].equals("-version")) { } else if (args[i].equals("-version")) {
System.err.println("java version \"" + System.err.println("java version \"" +
System.getProperty("java.version") + "\""); System.getProperty("java.version") + "\"");
...@@ -140,16 +140,16 @@ public class ContextIsolator { ...@@ -140,16 +140,16 @@ public class ContextIsolator {
return null; return null;
} else if (args[i].equals("-Xclassloader")) { } else if (args[i].equals("-Xclassloader")) {
// Non-standard try - use a different class loader. // Non-standard try - use a different class loader.
if (i+1 >= args.length) { if (i + 1 >= args.length) {
System.err.println("RunJava: Missing parameter after '"+args[i]+"'"); System.err.println("RunJava: Missing parameter after '" + args[i] + "'");
return null; return null;
} }
Xclassloader = args[i+1]; Xclassloader = args[i + 1];
i++; i++;
} else if (!args[i].startsWith("-")) { } else if (!args[i].startsWith("-")) {
return runClass(args[i], java.util.Arrays.copyOfRange(args, i+1, args.length), classpath); return runClass(args[i], java.util.Arrays.copyOfRange(args, i + 1, args.length), classpath);
} else { } else {
System.err.println("RunJava: Unknown parameter '"+args[i]+"'"); System.err.println("RunJava: Unknown parameter '" + args[i] + "'");
return null; return null;
} }
} }
...@@ -185,12 +185,12 @@ public class ContextIsolator { ...@@ -185,12 +185,12 @@ public class ContextIsolator {
ClassLoader appClassLoader = getClassLoader(classpath, osvClassLoader.getParent()); ClassLoader appClassLoader = getClassLoader(classpath, osvClassLoader.getParent());
return run(appClassLoader, new SandBoxedProcess() { return run(appClassLoader, new SandBoxedProcess() {
@Override @Override
public void run() throws Throwable { public void run() throws Throwable {
updateClassPathProperty(classpath); updateClassPathProperty(classpath);
runMain(loadClass(mainClass), args); runMain(loadClass(mainClass), args);
} }
}); });
} }
private static ClassLoader getClassLoader(Iterable<String> classpath, ClassLoader parent) throws MalformedURLException { private static ClassLoader getClassLoader(Iterable<String> classpath, ClassLoader parent) throws MalformedURLException {
...@@ -217,7 +217,7 @@ public class ContextIsolator { ...@@ -217,7 +217,7 @@ public class ContextIsolator {
static void runMain(Class<?> klass, String[] args) throws Throwable { static void runMain(Class<?> klass, String[] args) throws Throwable {
Method main = klass.getMethod("main", String[].class); Method main = klass.getMethod("main", String[].class);
try { try {
main.invoke(null, new Object[] { args }); main.invoke(null, new Object[]{args});
} catch (InvocationTargetException ex) { } catch (InvocationTargetException ex) {
throw ex.getCause(); throw ex.getCause();
} }
...@@ -235,6 +235,7 @@ public class ContextIsolator { ...@@ -235,6 +235,7 @@ public class ContextIsolator {
} }
static String Xclassloader = null; static String Xclassloader = null;
private static URLClassLoader createAppClassLoader(URL[] urls, ClassLoader parent) { private static URLClassLoader createAppClassLoader(URL[] urls, ClassLoader parent) {
if (Xclassloader == null) { if (Xclassloader == null) {
return new URLClassLoader(urls, parent); return new URLClassLoader(urls, parent);
...@@ -286,7 +287,7 @@ public class ContextIsolator { ...@@ -286,7 +287,7 @@ public class ContextIsolator {
for (String component : classpath.split(":")) { for (String component : classpath.split(":")) {
if (component.endsWith("/*")) { if (component.endsWith("/*")) {
File dir = new File( File dir = new File(
component.substring(0, component.length()-2)); component.substring(0, component.length() - 2));
if (dir.isDirectory()) { if (dir.isDirectory()) {
for (File file : dir.listFiles()) { for (File file : dir.listFiles()) {
String filename = file.getPath(); String filename = file.getPath();
......
...@@ -12,15 +12,13 @@ import java.io.IOException; ...@@ -12,15 +12,13 @@ import java.io.IOException;
* the jar file, followed by their command lines. * the jar file, followed by their command lines.
* *
* @author amnon * @author amnon
*
*/ */
public class MultiJarLoader { public class MultiJarLoader {
/** /**
* the main file runs the loaded file. * the main file runs the loaded file.
* *
* @param args * @param args - it looks for a javamains file, with the -mains flag e.g.
* - it looks for a javamains file, with the -mains flag e.g. * - mains /usr/mgmt/myfile.txt
* -mains /usr/mgmt/myfile.txt
*/ */
public static void main(String[] args) { public static void main(String[] args) {
for (int i = 0; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
...@@ -41,8 +39,7 @@ public class MultiJarLoader { ...@@ -41,8 +39,7 @@ public class MultiJarLoader {
* runFromFile read a java mains file and execute each of the commands * runFromFile read a java mains file and execute each of the commands
* each line with its own main, will be run on its own thread * each line with its own main, will be run on its own thread
* *
* @param fileName * @param fileName the file name to read from
* the file name to read from
*/ */
private static void runFromFile(String fileName) { private static void runFromFile(String fileName) {
FileReader fr = null; FileReader fr = null;
...@@ -74,8 +71,7 @@ public class MultiJarLoader { ...@@ -74,8 +71,7 @@ public class MultiJarLoader {
/** /**
* when reading the java mains file, check if a line is an executable line. * when reading the java mains file, check if a line is an executable line.
* *
* @param line * @param line a line from the file
* a line from the file
* @return true if this is an executable line, comments and empty lines are * @return true if this is an executable line, comments and empty lines are
* ignored. sleep with a number in millisecond is supported, and * ignored. sleep with a number in millisecond is supported, and
* would put the main thread into sleep * would put the main thread into sleep
...@@ -103,7 +99,6 @@ public class MultiJarLoader { ...@@ -103,7 +99,6 @@ public class MultiJarLoader {
* terminate the process * terminate the process
* *
* @author amnon * @author amnon
*
*/ */
private static class RunOnThread extends Thread { private static class RunOnThread extends Thread {
private String args; private String args;
......
package io.osv; package io.osv;
import java.util.List; import com.sun.management.GarbageCollectionNotificationInfo;
import javax.management.MBeanServer;
import javax.management.ObjectName; import javax.management.*;
import javax.management.openmbean.CompositeData;
import java.lang.management.GarbageCollectorMXBean; import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory; import java.lang.management.ManagementFactory;
import javax.management.Notification; import java.util.List;
import javax.management.NotificationEmitter;
import javax.management.NotificationListener;
import javax.management.openmbean.CompositeData;
import com.sun.management.GarbageCollectionNotificationInfo;
public class OSvGCMonitor { public class OSvGCMonitor {
...@@ -18,17 +15,17 @@ public class OSvGCMonitor { ...@@ -18,17 +15,17 @@ public class OSvGCMonitor {
} }
private native static void NotifyOSv(long h); private native static void NotifyOSv(long h);
static long handle; static long handle;
static void MonitorGC(long h){
static void MonitorGC(long h) {
handle = h; handle = h;
List<GarbageCollectorMXBean> gcbeans = java.lang.management.ManagementFactory.getGarbageCollectorMXBeans(); List<GarbageCollectorMXBean> gcbeans = java.lang.management.ManagementFactory.getGarbageCollectorMXBeans();
MBeanServer server = ManagementFactory.getPlatformMBeanServer(); MBeanServer server = ManagementFactory.getPlatformMBeanServer();
try try {
{
ObjectName gcName = new ObjectName(ManagementFactory.GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + ",*"); ObjectName gcName = new ObjectName(ManagementFactory.GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + ",*");
for (ObjectName name : server.queryNames(gcName, null)) for (ObjectName name : server.queryNames(gcName, null)) {
{
GarbageCollectorMXBean gc = ManagementFactory.newPlatformMXBeanProxy(server, name.getCanonicalName(), GarbageCollectorMXBean.class); GarbageCollectorMXBean gc = ManagementFactory.newPlatformMXBeanProxy(server, name.getCanonicalName(), GarbageCollectorMXBean.class);
gcbeans.add(gc); gcbeans.add(gc);
...@@ -56,9 +53,7 @@ public class OSvGCMonitor { ...@@ -56,9 +53,7 @@ public class OSvGCMonitor {
}; };
emitter.addNotificationListener(listener, null, null); emitter.addNotificationListener(listener, null, null);
} }
} } catch (Exception e) {
catch (Exception e)
{
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment