rpms/plexus-cdc/devel plexus-cdc.spec, 1.14, 1.15 plexus-cdc-qdox-1.9.patch, 1.1, 1.2

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-cdc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24896/devel

Modified Files:
	plexus-cdc.spec plexus-cdc-qdox-1.9.patch 
Log Message:
* Thu Nov 26 2009 Lubomir Rintel <lkundrak at v3.sk> 0:1.0-0.6.a10.1.3
- Fix NULL dereference in the qdox patch


Index: plexus-cdc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cdc/devel/plexus-cdc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- plexus-cdc.spec	23 Nov 2009 12:58:49 -0000	1.14
+++ plexus-cdc.spec	26 Nov 2009 19:40:12 -0000	1.15
@@ -36,7 +36,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.5.a10.1.3%{?dist}
+Release:        0.6.a10.1.3%{?dist}
 Epoch:          0
 Summary:        Plexus Component Descriptor Creator
 License:        MIT
@@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Thu Nov 26 2009 Lubomir Rintel <lkundrak at v3.sk> 0:1.0-0.6.a10.1.3
+- Fix NULL dereference in the qdox patch
+
 * Mon Nov 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.5.a10.1.3
 - BR maven-doxia-sitetools.
 

plexus-cdc-qdox-1.9.patch:
 ComponentGleaner.java              |    4 ++--
 PlexusDefaultComponentGleaner.java |   16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

Index: plexus-cdc-qdox-1.9.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cdc/devel/plexus-cdc-qdox-1.9.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- plexus-cdc-qdox-1.9.patch	23 Nov 2009 12:47:44 -0000	1.1
+++ plexus-cdc-qdox-1.9.patch	26 Nov 2009 19:40:12 -0000	1.2
@@ -19,12 +19,16 @@
          throws ComponentDescriptorCreatorException
      {
          DocletTag tag = javaClass.getTagByName( PLEXUS_COMPONENT_TAG );
-@@ -274,7 +274,7 @@
+@@ -268,7 +268,11 @@ 
  
              String fqn = ifc.getFullyQualifiedName();
  
 -            String pkg = ifc.getPackage();
-+            String pkg = ifc.getPackage().getName();
++            String pkg = null;
++            if ( ifc.getPackage() != null )
++            {
++                pkg = ifc.getPackage().getName();
++            }
  
              if ( pkg == null )
              {
@@ -75,3 +79,4 @@
 +    ComponentDescriptor glean( JavaDocBuilder classCache, JavaClass javaClass )
          throws ComponentDescriptorCreatorException;
  }
+