Index: C:/Dev/xwiki1.3Patch/xwiki-core/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarData.java =================================================================== --- C:/Dev/xwiki1.3Patch/xwiki-core/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarData.java (revision 8050) +++ C:/Dev/xwiki1.3Patch/xwiki-core/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarData.java (working copy) @@ -235,11 +235,20 @@ StringBuffer result = new StringBuffer(); for (Iterator it = getCalendarData(tddate).iterator(); it.hasNext(); ) { CalendarEvent event = (CalendarEvent) it.next(); - String user = event.getUser().trim(); + + String user = event.getUser(); + if (user != null){ + user.trim(); + } + if ((filteredUser != null) && (!filteredUser.trim().equals("")) && (!filteredUser.trim().equals(user))) { continue; } - String location = event.getLocation().trim(); + String location = event.getLocation(); + if (location != null){ + location.trim(); + } + if ((filteredLocation != null) && (!filteredLocation.trim().equals("")) && (!filteredLocation.trim().equals(location))) { continue; } @@ -252,7 +261,10 @@ } } categories = event.getCategory(); - String title = event.getTitle().trim(); + String title = event.getTitle(); + if (title != null){ + title.trim(); + } String url = event.getUrl(); result.append("
0) {