Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 79D7B105CC for ; Sat, 3 Jan 2015 14:33:25 +0000 (UTC) Received: (qmail 14309 invoked by uid 500); 3 Jan 2015 14:33:26 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 14248 invoked by uid 500); 3 Jan 2015 14:33:26 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 14238 invoked by uid 99); 3 Jan 2015 14:33:26 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Jan 2015 14:33:26 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id B0811AC053F; Sat, 3 Jan 2015 14:33:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1649206 - /directory/escimo/trunk/ldap/src/main/java/org/apache/directory/scim/ldap/LdapResourceProvider.java Date: Sat, 03 Jan 2015 14:33:15 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150103143324.B0811AC053F@hades.apache.org> Author: kayyagari Date: Sat Jan 3 14:33:14 2015 New Revision: 1649206 URL: http://svn.apache.org/r1649206 Log: fixed an NPE Modified: directory/escimo/trunk/ldap/src/main/java/org/apache/directory/scim/ldap/LdapResourceProvider.java Modified: directory/escimo/trunk/ldap/src/main/java/org/apache/directory/scim/ldap/LdapResourceProvider.java URL: http://svn.apache.org/viewvc/directory/escimo/trunk/ldap/src/main/java/org/apache/directory/scim/ldap/LdapResourceProvider.java?rev=1649206&r1=1649205&r2=1649206&view=diff ============================================================================== --- directory/escimo/trunk/ldap/src/main/java/org/apache/directory/scim/ldap/LdapResourceProvider.java (original) +++ directory/escimo/trunk/ldap/src/main/java/org/apache/directory/scim/ldap/LdapResourceProvider.java Sat Jan 3 14:33:14 2015 @@ -191,7 +191,10 @@ public class LdapResourceProvider implem { String json = SchemaUtil.getSchemaJson( u ); JsonSchema schema = JsonSchema.parse( json ); - schemas.put( schema.getId(), schema ); + if ( schema != null ) + { + schemas.put( schema.getId(), schema ); + } } }