In XMLA driver, handle empty string value for PROPERTY_CONTENT_TYPE a…

…ttribute (bug 2025638). git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@101 c6a108a4-781c-0410-a6c6-c2d559e19af0
ps3331333 · Jul 23, 2008 · e1280ce · e1280ce
1 parent f806186
commit e1280ce
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
@@ -1230,11 +1230,15 @@ public void handle(
  Datatype dataType =
  Datatype.forXmlaOrdinal(
  integerElement(row, "DATA_TYPE"));
+ final Integer contentTypeOrdinal =
+ integerElement(row, "PROPERTY_CONTENT_TYPE");
  Property.ContentType contentType =
- Property.ContentType.forXmlaOrdinal(
- integerElement(row, "PROPERTY_CONTENT_TYPE"));
+ contentTypeOrdinal == null
+ ? null
+ : Property.ContentType.forXmlaOrdinal(contentTypeOrdinal);
  int propertyType = integerElement(row, "PROPERTY_TYPE");
- Set<Property.TypeFlag> type = Property.TypeFlag.forMask(propertyType);
+ Set<Property.TypeFlag> type =
+ Property.TypeFlag.forMask(propertyType);
  list.add(
  new XmlaOlap4jProperty(
  uniqueName, name, caption, description, dataType, type,