Skip to content

Commit a383d3f

Browse files
committed
remove old comments
1 parent 410ed29 commit a383d3f

File tree

2 files changed

+0
-40
lines changed

2 files changed

+0
-40
lines changed

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Daemon.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public class Daemon extends Thread {
4141

4242
Subject startSubject;
4343

44-
//To be replaced with this in the next JDK24 patch:
4544
@Override
4645
public final void start() {
4746
startSubject = SubjectUtil.current();

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/HadoopThread.java

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,6 @@ public HadoopThread(ThreadGroup group, Runnable target, String name) {
6969
this.hadoopTarget = target;
7070
}
7171

72-
// @Override
73-
// public final void start() {
74-
// // This is temporary, to be replaced with JVM version dependent
75-
// // Subject.current() shim
76-
// AccessControlContext context = AccessController.getContext();
77-
// startSubject = Subject.getSubject(context);
78-
// super.start();
79-
// }
80-
81-
// To be replaced with this in the next JDK24 patch:
8272
@Override
8373
public final void start() {
8474
startSubject = SubjectUtil.current();
@@ -96,35 +86,6 @@ public void work() {
9686
throw new IllegalArgumentException("No Runnable was specified and work() is not overriden");
9787
}
9888

99-
// @Override
100-
// public final void run() {
101-
// try {
102-
// // This is temporary, to be replaced with JVM version dependent shim code
103-
// Subject.doAs(startSubject, new PrivilegedExceptionAction<Void>() {
104-
//
105-
// @Override
106-
// public Void run() throws Exception {
107-
// if (hadoopTarget != null) {
108-
// hadoopTarget.run();
109-
// } else {
110-
// work();
111-
// }
112-
// return null;
113-
// }
114-
//
115-
// });
116-
// } catch (PrivilegedActionException ce) {
117-
// Exception t = ce.getException();
118-
// if (t instanceof RuntimeException) {
119-
// throw (RuntimeException) t;
120-
// } else {
121-
// throw new RuntimeException("Unexpected exception", t);
122-
// }
123-
// }
124-
// }
125-
126-
// To replaced with this in the next patch:
127-
12889
@Override
12990
public final void run() {
13091
SubjectUtil.doAs(startSubject, new PrivilegedAction<Void>() {

0 commit comments

Comments
 (0)