You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/05/26 17:49:48 UTC
svn commit: r409684 - in /incubator/harmony/enhanced/classlib/trunk/modules:
archive/src/main/java/java/util/zip/InflaterInputStream.java
beans/src/main/java/java/beans/Introspector.java
beans/src/main/java/java/beans/XMLEncoder.java
Author: tellison
Date: Fri May 26 08:49:48 2006
New Revision: 409684
URL: http://svn.apache.org/viewvc?rev=409684&view=rev
Log:
Fix for HARMONY-518 (Fix to remove constant conditions in classlib sources)
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Introspector.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLEncoder.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java?rev=409684&r1=409683&r2=409684&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java Fri May 26 08:49:48 2006
@@ -137,8 +137,6 @@
// avoid int overflow, check null buffer
if (off <= buffer.length && nbytes >= 0 && off >= 0
&& buffer.length - off >= nbytes) {
- if (nbytes == 0)
- return 0;
do {
if (inf.needsInput())
fill();
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Introspector.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Introspector.java?rev=409684&r1=409683&r2=409684&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Introspector.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Introspector.java Fri May 26 08:49:48 2006
@@ -664,7 +664,7 @@
Method method = (Method) iterator.next();
String methodName = method.getName();
String propertyName = extractPropertyName(methodName);
- if ((!checkExisting) || (checkExisting && (hmPropertyDescriptors.get(propertyName) == null))) {
+ if ((!checkExisting) || (hmPropertyDescriptors.get(propertyName) == null)) {
PropertyDescriptor propertyDescriptor = null;
try {
propertyDescriptor = new PropertyDescriptor(propertyName, beanClass);
@@ -686,8 +686,7 @@
Method method = (Method) iterator.next();
String methodName = method.getName();
String propertyName = extractPropertyName(methodName);
- if ((!checkExisting) || (checkExisting
- && (hmPropertyDescriptors.get(propertyName) == null))) {
+ if ((!checkExisting) || (hmPropertyDescriptors.get(propertyName) == null)) {
IndexedPropertyDescriptor indexedPropertyDescriptor = null;
try {
indexedPropertyDescriptor = new IndexedPropertyDescriptor(
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLEncoder.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLEncoder.java?rev=409684&r1=409683&r2=409684&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLEncoder.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLEncoder.java Fri May 26 08:49:48 2006
@@ -202,13 +202,9 @@
if(type != null) {
// check if it is necessary to assign
// and display *id* attribute to the object
- if(isReferenced) {
- String objectName = NameMaker.getInstanceName(
- type);
-
- node.setId(objectName);
- tag.addAttr("id", objectName);
- }
+ String objectName = NameMaker.getInstanceName(type);
+ node.setId(objectName);
+ tag.addAttr("id", objectName);
}
} catch (Exception e) {
getExceptionListener().exceptionThrown(e);