hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r599714 - in /lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell: ExitException.java ShellSecurityManager.java
Date Fri, 30 Nov 2007 07:36:48 GMT
Author: stack
Date: Thu Nov 29 23:36:46 2007
New Revision: 599714

URL: http://svn.apache.org/viewvc?rev=599714&view=rev
Log:
HADOOP-2297 System.exit() Handling in hbase shell jar command
Forgot to add new files in last commit

Added:
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ExitException.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShellSecurityManager.java

Added: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ExitException.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ExitException.java?rev=599714&view=auto
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ExitException.java
(added)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ExitException.java
Thu Nov 29 23:36:46 2007
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2007 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.shell;
+
+public class ExitException extends SecurityException {
+  private static final long serialVersionUID = -8085525076856622991L;
+  /** Status code */
+  private int status;
+
+  /**
+   * Constructs an exit exception.
+   * 
+   * @param status the status code returned via System.exit()
+   */
+  public ExitException(int status) {
+    this.status = status;
+  }
+
+  /**
+   * The status code returned by System.exit()
+   * 
+   * @return the status code returned by System.exit()
+   */
+  public int getStatus() {
+    return status;
+  }
+}

Added: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShellSecurityManager.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShellSecurityManager.java?rev=599714&view=auto
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShellSecurityManager.java
(added)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShellSecurityManager.java
Thu Nov 29 23:36:46 2007
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2007 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.shell;
+
+import java.io.IOException;
+import java.security.Permission;
+
+import org.apache.hadoop.hbase.Shell;
+
+/**
+ * This is intended as a replacement for the default system manager. The goal is
+ * to intercept System.exit calls and make it throw an exception instead so that
+ * a System.exit in a jar command program does not fully terminate Shell.
+ * 
+ * @see ExitException
+ */
+public class ShellSecurityManager extends SecurityManager {
+
+  /**
+   * Override SecurityManager#checkExit. This throws an ExitException(status)
+   * exception.
+   * 
+   * @param status the exit status
+   */
+  @SuppressWarnings("static-access")
+  public void checkExit(int status) {
+    if (status != 9999) {
+      // throw new ExitException(status);
+
+      // I didn't figure out How can catch the ExitException in shell main.
+      // So, I just Re-launching the shell.
+      Shell shell = new Shell();
+      String[] args = new String[] { String.valueOf(status) };
+      try {
+        shell.main(args);
+      } catch (IOException e) {
+        e.printStackTrace();
+      }
+    }
+  }
+
+  /**
+   * Override SecurityManager#checkPermission. This does nothing.
+   * 
+   * @param perm the requested permission.
+   */
+  public void checkPermission(Permission perm) {
+  }
+}



Mime
View raw message