diff options
| author | Richard PALO <richard@netbsd.org> | 2014-12-17 14:22:16 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2015-05-05 12:02:30 -0400 |
| commit | 4d0eb50e691de4c20b1dd9976ad6839fede8a42d (patch) | |
| tree | 0becc84a73e9354e2102742371f71b78e0cb845a /usr/src/lib/libdtrace_jni | |
| parent | 37bbd7cc85ebfd31fbf68569b8b098e5448c9ce9 (diff) | |
| download | illumos-gate-4d0eb50e691de4c20b1dd9976ad6839fede8a42d.tar.gz | |
4719 update gate build environment to [open]jdk7
4742 update manifests for javadoc7
4743 Fix deprecated /usr/j2se usage in slp and remove from filesystem(5) manpage
4744 remove traces of /var/sadm/system/admin/default_java
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Diffstat (limited to 'usr/src/lib/libdtrace_jni')
| -rw-r--r-- | usr/src/lib/libdtrace_jni/java/Makefile | 8 | ||||
| -rw-r--r-- | usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LocalConsumer.java | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/usr/src/lib/libdtrace_jni/java/Makefile b/usr/src/lib/libdtrace_jni/java/Makefile index 90c0eb6b78..e0f3e8e31a 100644 --- a/usr/src/lib/libdtrace_jni/java/Makefile +++ b/usr/src/lib/libdtrace_jni/java/Makefile @@ -76,9 +76,9 @@ MANIFESTS= $(APIMANI) APICLASSPATH=$(CLASSES):$(APIJAVASRC) # javac flags -JFLAGS= -g -d $(CLASSES) -sourcepath $(APICLASSPATH) -deprecation -JFLAGS += -target 1.5 -JFLAGS += -Xlint +JFLAGS= -g -d $(CLASSES) -sourcepath $(APICLASSPATH) +JFLAGS += -source 1.5 -target 1.6 +JFLAGS += -Xlint:all,-rawtypes,-options # The default make rule for Java files COMPILE.java=$(JAVAC) $(JFLAGS) @@ -88,7 +88,7 @@ $(CLASSES)/$(PKGPATH)/%.class: $(APIJAVASRC)/$(PKGPATH)/%.java # javah generated headers APIHDR= LocalConsumer.h -JNIHDRS=$(JNI)/$(APIHDRS) +JNIHDRS=$(JNI)/$(APIHDR) # API classes with native methods JNI_CLASSNAMES=\ diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LocalConsumer.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LocalConsumer.java index 51e2630931..65dc65e38d 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LocalConsumer.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LocalConsumer.java @@ -22,8 +22,6 @@ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * ident "%Z%%M% %I% %E% SMI" */ package org.opensolaris.os.dtrace; @@ -637,7 +635,7 @@ public class LocalConsumer implements Consumer { // that listeners finish executing consumerStopped() // before the stop() method returns. synchronized (this) { - if (state == State.STOPPED || state == state.CLOSED) { + if (state == State.STOPPED || state == State.CLOSED) { // // This consumer was stopped just after calling // go() but before starting (the premature return |