/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jul 12 09:53:28 PDT 2010
changeset fdc10d3deefb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fdc10d3deefb
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 12 17:51:21 2010 +0100
PR icedtea/512: Use the pristine srcdir copy of generated.
2010-07-12 Andrew John Hughes <ahughes at redhat.com>
PR icedtea/521
* Makefile.am: (SOURCEPATH_DIRS): The untainted srcdir
version of generated should be used.
* configure.ac: Remove duplicate WITH_OPENJDK_SRC_DIR call.
changeset dad3510bc1f6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=dad3510bc1f6
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 12 17:53:23 2010 +0100
Merge
diffstat:
8 files changed, 175 insertions(+), 82 deletions(-)
ChangeLog | 28 +++
Makefile.am | 2
configure.ac | 1
netx/net/sourceforge/jnlp/Parser.java | 72 ++++++++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java | 29 +--
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java | 6
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 36 +---
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java | 83 +++++-----
diffs (truncated from 504 to 500 lines):
diff -r cc1498495367 -r dad3510bc1f6 ChangeLog
--- a/ChangeLog Thu Jul 08 20:37:25 2010 +0100
+++ b/ChangeLog Mon Jul 12 17:53:23 2010 +0100
@@ -1,3 +1,31 @@ 2010-07-08 Andrew John Hughes <ahughes
+2010-07-12 Andrew John Hughes <ahughes at redhat.com>
+
+ PR icedtea/521
+ * Makefile.am:
+ (SOURCEPATH_DIRS): The untainted srcdir
+ version of generated should be used.
+ * configure.ac:
+ Remove duplicate WITH_OPENJDK_SRC_DIR call.
+
+2010-07-12 Jon VanAlten <jon.vanalten at redhat.com>
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java:
+ Eliminate spurious exception throwing from open, close, read, write,
+ drain, and flush calls on closed lines.
+ Use isOpen() API call instead of instance variable where appropriate.
+
+2010-07-08 Man Lung Wong <mwong at redhat.com>
+
+ * netx/net/sourceforge/jnlp/Parser.java:
+ (getRootNode): Used BufferedInputStream instead of InputStream to
+ have mark and reset method available. Passed the encoding to the
+ constructor of InputStreamReader, such that the stream will now
+ be parsed with the encoding the jnlp file is in.
+ (getEncoding): A new method which checks the first four bytes of input
+ and determines what the files encoding is.
+
2010-07-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r cc1498495367 -r dad3510bc1f6 Makefile.am
--- a/Makefile.am Thu Jul 08 20:37:25 2010 +0100
+++ b/Makefile.am Mon Jul 12 17:53:23 2010 +0100
@@ -56,7 +56,7 @@ OPENJDK_SOURCEPATH_DIRS = \
OPENJDK_SOURCEPATH_DIRS = \
$(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA)
-SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
+SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
# Sources used from OpenJDK.
ICEDTEA_BOOTSTRAP_DIRS = \
diff -r cc1498495367 -r dad3510bc1f6 configure.ac
--- a/configure.ac Thu Jul 08 20:37:25 2010 +0100
+++ b/configure.ac Mon Jul 12 17:53:23 2010 +0100
@@ -170,7 +170,6 @@ FIND_RHINO_JAR
FIND_RHINO_JAR
WITH_OPENJDK_SRC_ZIP
WITH_HOTSPOT_SRC_ZIP
-WITH_OPENJDK_SRC_DIR
WITH_ALT_JAR_BINARY
WITH_JAXP_DROP_ZIP
WITH_JAF_DROP_ZIP
diff -r cc1498495367 -r dad3510bc1f6 netx/net/sourceforge/jnlp/Parser.java
--- a/netx/net/sourceforge/jnlp/Parser.java Thu Jul 08 20:37:25 2010 +0100
+++ b/netx/net/sourceforge/jnlp/Parser.java Mon Jul 12 17:53:23 2010 +0100
@@ -1168,12 +1168,16 @@ class Parser {
Node document = new Node(TinyParser.parseXML(input));
Node jnlpNode = getChildNode(document, "jnlp"); // skip comments
*/
+
+ //A BufferedInputStream is used to allow marking and reseting
+ //of a stream.
+ BufferedInputStream bs = new BufferedInputStream(input);
/* NANO */
final XMLElement xml = new XMLElement();
final PipedInputStream pin = new PipedInputStream();
- final PipedOutputStream pout = new PipedOutputStream(pin);
- final InputStreamReader isr = new InputStreamReader(input);
+ final PipedOutputStream pout = new PipedOutputStream(pin);
+ final InputStreamReader isr = new InputStreamReader(bs, getEncoding(bs));
// Clean the jnlp xml file of all comments before passing
// it to the parser.
new Thread(
@@ -1196,7 +1200,69 @@ class Parser {
throw new ParseException(R("PBadXML"), ex);
}
}
+
+ /**
+ * Returns the name of the encoding used in this InputStream.
+ *
+ * @param input the InputStream
+ * @return a String representation of encoding
+ */
+ private static String getEncoding(InputStream input) throws IOException{
+ //Fixme: This only recognizes UTF-8, UTF-16, and
+ //UTF-32, which is enough to parse the prolog portion of xml to
+ //find out the exact encoding (if it exists). The reason being
+ //there could be other encodings, such as ISO 8859 which is 8-bits
+ //but it supports latin characters.
+ //So what needs to be done is to parse the prolog and retrieve
+ //the exact encoding from it.
+ int[] s = new int[4];
+ String encoding = "UTF-8";
+
+ //Determine what the first four bytes are and store
+ //them into an int array.
+ input.mark(4);
+ for (int i = 0; i < 4; i++) {
+ s[i] = input.read();
+ }
+ input.reset();
+
+ //Set the encoding base on what the first four bytes of the
+ //inputstream turn out to be (following the information from
+ //www.w3.org/TR/REC-xml/#sec-guessing).
+ if (s[0] == 255) {
+ if (s[1] == 254) {
+ if (s[2] != 0 || s[3] != 0) {
+ encoding = "UnicodeLittle";
+ } else {
+ encoding = "X-UTF-32LE-BOM";
+ }
+ }
+ } else if (s[0] == 254 && s[1] == 255 && (s[2] != 0 ||
+ s[3] != 0)) {
+ encoding = "UTF-16";
+
+ } else if (s[0] == 0 && s[1] == 0 && s[2] == 254 &&
+ s[3] == 255) {
+ encoding = "X-UTF-32BE-BOM";
+
+ } else if (s[0] == 0 && s[1] == 0 && s[2] == 0 &&
+ s[3] == 60) {
+ encoding = "UTF-32BE";
+
+ } else if (s[0] == 60 && s[1] == 0 && s[2] == 0 &&
+ s[3] == 0) {
+ encoding = "UTF-32LE";
+
+ } else if (s[0] == 0 && s[1] == 60 && s[2] == 0 &&
+ s[3] == 63) {
+ encoding = "UTF-16BE";
+ } else if (s[0] == 60 && s[1] == 0 && s[2] == 63 &&
+ s[3] == 0) {
+ encoding = "UTF-16LE";
+ }
+
+ return encoding;
+ }
}
-
diff -r cc1498495367 -r dad3510bc1f6 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java Thu Jul 08 20:37:25 2010 +0100
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java Mon Jul 12 17:53:23 2010 +0100
@@ -86,7 +86,7 @@ abstract class PulseAudioDataLine extend
protected void open(AudioFormat format, int bufferSize)
throws LineUnavailableException {
- if (isOpen) {
+ if (isOpen()) {
throw new IllegalStateException("Line is already open");
}
@@ -139,7 +139,7 @@ abstract class PulseAudioDataLine extend
}
}
- if (!isOpen) {
+ if (!isOpen()) {
throw new IllegalArgumentException("Invalid format");
}
@@ -299,9 +299,10 @@ abstract class PulseAudioDataLine extend
@Override
public void close() {
- if (!isOpen) {
- throw new IllegalStateException(
- "Line must be open for close() to work");
+ if (!isOpen()) {
+ // For whatever reason, we are being asked to close
+ // a line that is not even open.
+ return;
}
synchronized (eventLoop.threadLock) {
@@ -346,7 +347,7 @@ abstract class PulseAudioDataLine extend
@Override
public void start() {
- if (!isOpen) {
+ if (!isOpen()) {
throw new IllegalStateException(
"Line must be open()ed before it can be start()ed");
}
@@ -376,10 +377,10 @@ abstract class PulseAudioDataLine extend
@Override
public synchronized void stop() {
- if (!isOpen) {
- throw new IllegalStateException(
- "Line must be open()ed before it can be start()ed");
-
+ if (!isOpen()) {
+ // For some reason, we are being asked to stop a line
+ // that isn't even open.
+ return;
}
writeInterrupted = true;
if (!isStarted) {
@@ -433,7 +434,7 @@ abstract class PulseAudioDataLine extend
throws LineUnavailableException;
public Stream getStream() {
- if (!isOpen) {
+ if (!isOpen()) {
throw new IllegalStateException("Line must be open");
}
@@ -442,7 +443,7 @@ abstract class PulseAudioDataLine extend
@Override
public int getBufferSize() {
- if (!isOpen) {
+ if (!isOpen()) {
return DEFAULT_BUFFER_SIZE;
}
return bufferSize;
@@ -450,7 +451,7 @@ abstract class PulseAudioDataLine extend
@Override
public AudioFormat getFormat() {
- if (!isOpen) {
+ if (!isOpen()) {
return defaultFormat;
}
return currentFormat;
@@ -467,7 +468,7 @@ abstract class PulseAudioDataLine extend
* the name of this audio stream
*/
public void setName(String streamName) {
- if (isOpen) {
+ if (isOpen()) {
Operation o;
synchronized (eventLoop.threadLock) {
diff -r cc1498495367 -r dad3510bc1f6 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java Thu Jul 08 20:37:25 2010 +0100
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java Mon Jul 12 17:53:23 2010 +0100
@@ -62,7 +62,7 @@ abstract class PulseAudioLine implements
@Override
public void close() {
- if (!isOpen) {
+ if (!isOpen()) {
throw new IllegalStateException("Line is not open");
}
@@ -79,7 +79,7 @@ abstract class PulseAudioLine implements
@Override
public Control getControl(Type control) {
- if (isOpen) {
+ if (isOpen()) {
for (Control aControl : controls) {
if (aControl.getType() == control) {
return aControl;
@@ -92,7 +92,7 @@ abstract class PulseAudioLine implements
@Override
public Control[] getControls() {
- if (!isOpen) {
+ if (!isOpen()) {
return new Control[] {};
}
diff -r cc1498495367 -r dad3510bc1f6 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Thu Jul 08 20:37:25 2010 +0100
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Mon Jul 12 17:53:23 2010 +0100
@@ -142,8 +142,9 @@ public final class PulseAudioSourceDataL
writeInterrupted = false;
}
- if (!isOpen) {
- throw new IllegalStateException("must call open() before write()");
+ if (!isOpen()) {
+ // A closed line can write exactly 0 bytes.
+ return 0;
}
int frameSize = currentFormat.getFrameSize();
@@ -259,11 +260,6 @@ public final class PulseAudioSourceDataL
@Override
public void drain() {
- if (!isOpen) {
- throw new IllegalStateException(
- "Line must be open before it can be drain()ed");
-
- }
synchronized (this) {
writeInterrupted = true;
@@ -271,13 +267,13 @@ public final class PulseAudioSourceDataL
do {
synchronized (this) {
- if (!isOpen) {
+ if (!isOpen()) {
return;
}
if (getBytesInBuffer() == 0) {
return;
}
- if (isStarted || !isOpen) {
+ if (isStarted) {
break;
}
try {
@@ -301,29 +297,27 @@ public final class PulseAudioSourceDataL
@Override
public void flush() {
- if (!isOpen) {
- throw new IllegalStateException(
- "Line must be open before it can be flush()ed");
- }
synchronized (this) {
writeInterrupted = true;
}
- Operation operation;
- synchronized (eventLoop.threadLock) {
- operation = stream.flush();
+ if (isOpen()) {
+ Operation operation;
+ synchronized (eventLoop.threadLock) {
+ operation = stream.flush();
+ }
+
+ operation.waitForCompletion();
+ operation.releaseReference();
}
-
- operation.waitForCompletion();
- operation.releaseReference();
}
@Override
synchronized public void close() {
- if (!isOpen) {
- throw new IllegalStateException("not open so cant close");
+ if (!isOpen()) {
+ return;
}
writeInterrupted = true;
diff -r cc1498495367 -r dad3510bc1f6 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java Thu Jul 08 20:37:25 2010 +0100
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java Mon Jul 12 17:53:23 2010 +0100
@@ -76,14 +76,18 @@ public final class PulseAudioTargetDataL
@Override
synchronized public void close() {
+ if (!isOpen()) {
+ // Probably due to some programmer error, we are being
+ // asked to close an already closed line. Oh well.
+ Debug.println(DebugLevel.Verbose,
+ "PulseAudioTargetDataLine.close(): "
+ + "Line closed that wasn't open.");
+ return;
+ }
+
/* check for permission to record audio */
AudioPermission perm = new AudioPermission("record", null);
perm.checkGuard(null);
-
- if (!isOpen) {
- throw new IllegalStateException(
- "Line cant be closed if it isnt open");
- }
PulseAudioMixer parentMixer = PulseAudioMixer.getInstance();
parentMixer.removeTargetLine(this);
@@ -101,7 +105,7 @@ public final class PulseAudioTargetDataL
AudioPermission perm = new AudioPermission("record", null);
perm.checkGuard(null);
- if (isOpen) {
+ if (isOpen()) {
throw new IllegalStateException("already open");
}
super.open(format, bufferSize);
@@ -142,8 +146,9 @@ public final class PulseAudioTargetDataL
/* check state and inputs */
- if (!isOpen) {
- throw new IllegalStateException("must call open() before read()");
+ if (!isOpen()) {
+ // A closed line can produce zero bytes of data.
+ return 0;
}
int frameSize = currentFormat.getFrameSize();
@@ -220,7 +225,7 @@ public final class PulseAudioTargetDataL
while (remainingLength != 0) {
synchronized (this) {
- if (!isOpen || !isStarted) {
+ if (!isOpen() || !isStarted) {
return sizeRead;
}
@@ -287,57 +292,57 @@ public final class PulseAudioTargetDataL
@Override
public void drain() {
- if (!isOpen) {
- throw new IllegalStateException("must call open() before drain()");
+ // blocks when there is data on the line
+ // http://www.jsresources.org/faq_audio.html#stop_drain_tdl
+ while (true) {
+ synchronized (this) {
+ if (!isStarted || !isOpen()) {
+ break;
+ }
+ }
+ try {
+ //TODO: Is this the best length of sleep?
+ //Maybe in case this loop runs for a long time
+ //it would be good to switch to a longer
+ //sleep. Like bump it up each iteration after
+ //the Nth iteration, up to a MAXSLEEP length.
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ // do nothing
+ }
}
synchronized (this) {
drained = true;
}
- // blocks when there is data on the line
- // http://www.jsresources.org/faq_audio.html#stop_drain_tdl
- while (true) {
- synchronized (this) {
- if (!isStarted || !isOpen) {
- break;
- }
- }
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- // do nothing
- }
- }
-
}
@Override
public void flush() {
- if (!isOpen) {
- throw new IllegalStateException("Line must be open");
+ if (isOpen()) {
+
+ /* flush the buffer on pulseaudio's side */
+ Operation operation;
+ synchronized (eventLoop.threadLock) {
+ operation = stream.flush();
+ }
+ operation.waitForCompletion();
+ operation.releaseReference();
}
-
- /* flush the buffer on pulseaudio's side */
- Operation operation;
- synchronized (eventLoop.threadLock) {
- operation = stream.flush();
- }
- operation.waitForCompletion();
- operation.releaseReference();
synchronized (this) {
flushed = true;
/* flush the partial fragment we stored */
fragmentBuffer = null;
}
-
}
@Override
public int available() {
- if (!isOpen) {
- throw new IllegalStateException("Line must be open");
+ if (!isOpen()) {
+ // a closed line has 0 bytes available.
More information about the distro-pkg-dev
mailing list