MONDRIAN: Oops!

[git-p4: depot-paths = "//open/mondrian/": change = 6358]
pentaho · Apr 24, 2006 · 7aeff57 · 7aeff57
1 parent c78870b
commit 7aeff57
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/mondrian/xmla/RowsetDefinition.java b/src/main/mondrian/xmla/RowsetDefinition.java
@@ -3304,8 +3304,10 @@ public void unparse(XmlaResponse response) throws XmlaException {
                 int[] returnCategories = fi.getReturnCategories();
 
                 // Convert Windows newlines in 'description' to UNIX format.
-                final String description =
-                        Util.replace(fi.getDescription(), "\r", "");
+                String description = fi.getDescription();
+                if (description != null) {
+                    description = Util.replace(fi.getDescription(), "\r", "");
+                }
                 if ((paramCategories == null) || (paramCategories.length == 0)) {
                     Row row = new Row();
                     row.set(FunctionName.name, fi.getName());