You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xindice-dev@xml.apache.org by vg...@apache.org on 2004/01/07 05:05:05 UTC
cvs commit: xml-xindice/java/src/org/apache/xindice/core/meta/inline InlineMetaService.java NullWriter.java ResourceTypeWriter.java
vgritsenko 2004/01/06 20:05:05
Modified: java/src/org/apache/xindice/core/meta/inline
InlineMetaService.java NullWriter.java
ResourceTypeWriter.java
Log:
minor changes
Revision Changes Path
1.7 +5 -17 xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineMetaService.java
Index: InlineMetaService.java
===================================================================
RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineMetaService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InlineMetaService.java 13 Aug 2003 03:18:45 -0000 1.6
+++ InlineMetaService.java 7 Jan 2004 04:05:05 -0000 1.7
@@ -159,12 +159,7 @@
* the header is corrupted.
*/
public DatabaseEntry readDatabaseEntry(Value rawValue) throws InlineMetaException {
- if (log.isDebugEnabled()) {
- log.debug("readDatabaseEntry: rawValue: length=" + rawValue.getLength());
- }
-
byte[] rawData = rawValue.getData();
-
if (log.isDebugEnabled()) {
log.debug("readDatabaseEntry: rawData: length=" + rawData.length + " byte 0: " + rawData[0] + " byte 1: " + rawData[1]);
}
@@ -175,13 +170,10 @@
int version = rawData[1];
if (!haveReaderForVersion(version)) {
- throw new InlineMetaException(FaultCodes.GEN_CRITICAL_ERROR, "No inline metadata reader available for version " + version);
- }
- InlineMetaReader reader = readerByVersion[version];
- if (log.isDebugEnabled()) {
- log.debug("readHeader: reader=" + reader);
+ throw new InlineMetaException(FaultCodes.GEN_CRITICAL_ERROR,
+ "No inline metadata reader available for version " + version);
}
-
+ final InlineMetaReader reader = readerByVersion[version];
InlineMetaMap map = reader.read(rawData, 2, rawData[0] - 2);
if (log.isDebugEnabled()) {
log.debug("readDatabaseEntry: map: type=" + map.get("type"));
@@ -192,10 +184,6 @@
*/
Value value = new Value(rawData, rawData[0], rawData.length - rawData[0]);
- if (log.isDebugEnabled()) {
- log.debug("readDatabaseEntry: value: type=" + map.get("type"));
- }
-
return new DatabaseEntry(map, value);
}
1.4 +5 -3 xml-xindice/java/src/org/apache/xindice/core/meta/inline/NullWriter.java
Index: NullWriter.java
===================================================================
RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/inline/NullWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NullWriter.java 7 Aug 2003 20:13:22 -0000 1.3
+++ NullWriter.java 7 Jan 2004 04:05:05 -0000 1.4
@@ -68,6 +68,8 @@
*/
public class NullWriter implements InlineMetaWriter {
+ private static final byte[] NULL = new byte[0];
+
/**
* @see org.apache.xindice.core.meta.inline.InlineMetaWriter#getVersion()
*/
@@ -79,6 +81,6 @@
* @see org.apache.xindice.core.meta.inline.InlineMetaWriter#getMetadata(InlineMetaMap)
*/
public byte[] getMetadata(InlineMetaMap map) throws InlineMetaException {
- return new byte[0];
+ return NULL;
}
}
1.4 +4 -4 xml-xindice/java/src/org/apache/xindice/core/meta/inline/ResourceTypeWriter.java
Index: ResourceTypeWriter.java
===================================================================
RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/inline/ResourceTypeWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourceTypeWriter.java 7 Aug 2003 20:13:22 -0000 1.3
+++ ResourceTypeWriter.java 7 Jan 2004 04:05:05 -0000 1.4
@@ -81,12 +81,12 @@
public byte[] getMetadata(InlineMetaMap map) throws InlineMetaException {
Integer type = (Integer) map.get("type");
if (type == null) {
- throw new InlineMetaException(FaultCodes.GEN_CRITICAL_ERROR, "unable to create resource type metadata: 'type' value is null");
+ throw new InlineMetaException(FaultCodes.GEN_CRITICAL_ERROR,
+ "Unable to create resource type metadata: 'type' value is null");
}
byte[] bytes = new byte[1];
bytes[0] = type.byteValue();
return bytes;
}
-
}