From 9f79372988049b13ae87614564f9fb8cb1ac5d00 Mon Sep 17 00:00:00 2001
From: Chris Recoskie <recoskie@ca.ibm.com>
Date: Tue, 14 Jun 2005 02:08:29 +0000
Subject: [PATCH] crecoskie June 13, 2005 - fix for Bugzilla 99483 (NPE in MBS
 if you have a file with no extension)

---
 .../testFileWithNoExtension.zip                 | Bin 0 -> 3484 bytes
 .../tests/ManagedProject30MakefileTests.java    |  16 ++++++++++++++++
 .../makegen/gnu/ManagedBuildGnuToolInfo.java    |   7 +++++++
 3 files changed, 23 insertions(+)
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/testFileWithNoExtension.zip

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/testFileWithNoExtension.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/testFileWithNoExtension.zip
new file mode 100644
index 0000000000000000000000000000000000000000..409d24e6c349e8ef36a9522deaa1c88788fb4f78
GIT binary patch
literal 3484
zcmaJ@2{hDu8@487Oi0=3N_JyO-0UUG%rIlkSi{8J!DJcRRkEar%GzbJMJij?#+KsR
z#%QcVmMDxRSu#G^$~V(@zmJ@+-Z^v5ob#Xe`M<yCect!^!NANcd<=(aAM>a;Dh&IA
zo%UPN%{{;si}G?`OtZ(}Knyo0PA}?S((*3+xY67?m|^IcVVykkY@}jwnDJJ5q<&k~
z{HyE;N$AK}Wdk%sVqJ4)>IA@HP0Ef#G+!~<0V{GOkvX4(Dh>A?+Em^NBRw2%$72*j
zrzBH#?L~5c`c~YdvG%za<nzvD?k47LTAf0z875FiEUVnaW9#lFK90ET?lSn%s2V7k
z>xObEmOY`<dM`H8@1(@+_1CqtYyjBFWJeEB;$>uubn5$e)rB_<H&UNUhs#f#a|uoR
zV0k&UKC|iBe6vGBa!p_JzymAQMiqS0gWyDAYh}q3@HTC;x%kyWQM{G`7`bl$hS31$
zE^k1swktFv`a}=bHuBb0l?P=yw8LUh7AY0%DqYpl_(>-~7E;V6u5|nBVg{~gF@w0w
znc*?h)M88?*TdF`LmtDvYE{}|EXe{ILsL?I$+M_kyfL42k-^97vYme9EIYeP#6kCJ
zzvt>WaYMd(ozFYNKEtrrJ)wHcYVD(DgQXZ=0>`%T+_jAtcDc9g^pvqthNjy%!H1;A
zzYKj@=A=|xbegj6IMj881_rVyKzOm?uzYlU&y)BSaTj;Z9^A$2u!px!mf{VrNH7mk
zmWYzvEmi$0LLwEEh0Gq04#S63!!}}igW;#H?B$sWizZQW4PxYCIW$`Nw6JB&%$G5I
z;FaY;vg*X{_`6(#S=8cC1J(O{OQVePhv^hby@+4EKxm5i*%jq;zKqKp^}~R2aQQMX
zsUbOSh16SGZ2*D4K2fd|&#V4f^qG%1R(bZV(YGSVE>dLqb{&C}`J(3PeWSZ`)1)<O
zt)|ni!tQYxnC&o&6t>-qiGe}-2m=G`rxNA-N1|8#Fn=K30#YrY=1j`Km$(hFjM~ba
z)7%4G;(`EixE8MO?xmohy7Wb!jV~|i!z2ZP=9wYXnV0F1?fHU^R>9heyOLv)+CbwG
z0k9l9=1x0FB>&5h?N>gm50T^C$i{EG>ML%VKqjY(ZG**|XLy94Cpm(7Oigl)OM2wd
zIHBna=i0Q@tpyC$UMCpEH9rbS+rcCjELh8(oMyjPqgh|g<#)B5Qq>xB6zvwXL>WI1
zj>G%6l4bg1)Wvp<0@Ng;aFvm5$5M;z^4`Jo>Q=KBE7qk|#!Nj;Z%)b!v$Y^7XH4g+
zqXM{-Te_s5PolN?pJ;<Ax`|pCp~~}86)uvwu3RT0c@TH9S!}ndEQ_Az8&iJ$O<pT%
z*Mr5hyZNICUON@`vZM)??VEM&<|q0vbdH6+c`D@?85qWBJpY{I!*q`SA^2LNzB#i5
z@Md=gjp3J^p;SG5Y>D>zqc&B5(rv{u#=*5&&J=R-nepI>hV+mdZ-p1jwl3UmtH%Zr
zed>-0haew11$CQmFVy?=J3GcHZv??cBrHH~ol6j<=w$wD29Q5h-?!%Dqrx?$YE;Zt
z5DMz6gUyefRyM6XaRNo}Isf&0y1w?^oJSdBGdA;9r@Sk<Ga?SDUIbahQtAd^<h!ps
z*g#w!6gI(a_Ee9KoF_?A>Te$CtxWtWlpaL^qBuO4k~N4{=X;)AdSTli&K2(XsC>H_
z;E^}u&%XNgKJob$6P=f*3asc!+NtMh-29vuA=*FuG2Te$D=06da}X-P)7b~(j0_Gy
z`uL+TKHyH1E|_uT(FO+^2HWBHZHcXPwE}71pJN`PJq<wm2PnE(lDfbo8K{YMnT(<d
zp=*d(Hbt4Fbau(XJD^=%{nEs4NbfYI@DRIS<OS7ZUdJHu#kmdgpzc1VXnj{bD;P_P
zaX*Yn#tPcYC<lke5-j`R9W1MAxt(zqVADIRd`F5kn|2URir<U-aEEG+qP;rqm&NhY
zo*E#1+&sN6`=R}nyf34X^rM$p^!niRfMEch-Lh1XVdI+(zZu3gRbeU79d9jGtwhS+
z+KL6OE!`e@waoOw%Qp3~@dwtlOx$q#Xz!ex*pNU|adqL9wBwN5y5IOu{c)u{I*#**
zOR1hL=Ow@G*dDRc<=>0c9M1=H>-SjeJh<rzj{aPQ4h}jq>ZZ%_U~GM(9Z-T^!IH_-
zdWT`h-ik!ROB8$b{#MhR<l0QKe_w%_Q8<1IlmO#-EP3zTKyX2bhRDG79sLTZnsaf*
z%KEo;QdJ1yj6{R#?apx5%eVX+k~TOCrk<5&oDB%g((=gqGF+eYDZCEQnPfZU-T!pP
zrBa??(vM(<q~#z+!)+1dOzkL_R34TPOV&-BzMgxkQy7SU8mH+j-)P3Xf<<w_7l})1
z>aQm>s)ly&*OJP``chD9+SIw1ge3C4#;ch)Hu*pfDfsCjiqD^ck-8AGcdYQGXF|<G
z8Zjr*9G2kO45N=2R><&AuMk%9$9r=&opwO2#}TJ1^Nw{q2XH1!#HY9p+^Uj}H4smh
zXbP))ZnXR~q-N-|T8PQyn^1lQ-aehy&?)DhL){a7PlkZfVRHf~B_RZRO6JA;r+l~6
zvP+!)UJ!D<XZe+tF4OUG?py**_M$AmlIgJ@m4I=jFJFH}Z?vUNf#Q3Lh0RrY1wuDe
zo&YiHB0L*_n!f=nn97?#;l{)+6SC!1f^7#;32qD}$irC*3+lc$IOt@VHF4Oy5WnJC
zhK4n~N<My@`@1p~dayE3+S?X>smufQ_+zksZb*7PB`_jKGYHtgw#qH1y}))@bgM%j
zp3)Y{raux;9q}T<J#TF};qk4|<>uxt&?k_PAratlv?U8-n`DC=1uPt2_XIZ!X4SQF
zxgQEWf1|p<`l?b^x82tL5ZTN1%p{VkFtI<LP%EdoQ^}5;RFUxIMfoNq=lvD!4F7!b
z+zqOAiGr+3M3~x{_wjg+_C~<(%ZFv71v4w^IKn-9TsxGKyt3~NEqU>#RVvZR*LzMj
zDWn}V;g@@d??>|ev99hYKl)iM9MPj7zH6ltyC32u-x$aRmEp@$is#wnQc?oT9yGxu
zhxse92|6P&y}ONQ4~YPCg@HElZ2u)~BU?eh#1{eg^I_0LL4lGa?8~E%ecOnhY8>`B
z;aL`=qZdavBFM{26Q_Fw2diZc89&jNSzl<jjJlNW0*w75P3!(-&NLIVNEEiBx-DwW
zrWDN!>PUOFw4C-uBV)=#eJdD`xR#xDf!DRPC%uGJx|_JkUm&XUs^%SeClP@k=UZpr
zBq;y(5<;D<wG0eV$}a@=A?z_$lCSiW4czm+7r4ScCh<+<=ZoczN{6)OB*3O0;TKvQ
z*@iWq2n5Qs*9y9`apuW3PkY&pWHO-}A?ssjv;M}+T&Y1QHYuG^DB5wdkYz33Vu4?e
z*=U;OXwvKb3+Rrz;O!t#q)AmnTwN|*N;svVH61Iw=F|LHlwWncE9~Kd%<hT{2m$fk
zN_soEW_I@Mj-&pVfmUNDo~m_i7^9mAUhsOlL0XdfHqina7JcVTZ=qLjeqRKweY(u_
z`C(+@W7xY}@4wQ}@76!Y|8Cj`)AqYG-9h#ukLKI-w13R`VB&roqnr3%u+gUbzm|S5
zYrj#^Ep9KwSbu4F2Z8pR3f<TC!k-58AD26rvw!{2?Pf24G>HFWJ_iBz?+f}?*b6}#
z1^WQ@cGf|N{ZsfOMB$GRdu!$(#C{df$8|3r&>Fw5ivJBS49xnSBX$OM26<Xr5#Kxg
EZw`WpS^xk5

literal 0
HcmV?d00001

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java
index a0b0f3ba5e3..cabd099fd0e 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java
@@ -60,6 +60,7 @@ public class ManagedProject30MakefileTests extends TestCase {
 		suite.addTest(new ManagedProject30MakefileTests("test30CopyandDeploy"));
 		suite.addTest(new ManagedProject30MakefileTests("test30DeleteFile"));
 		suite.addTest(new ManagedProject30MakefileTests("test30NoFilesToBuild"));
+		suite.addTest(new ManagedProject30MakefileTests("testFileWithNoExtension"));
 		suite.addTest(new ManagedProject30MakefileTests("testPreAndPostProcessBuildSteps"));
 		suite.addTest(new ManagedProject30MakefileTests("test30_1"));
 		suite.addTest(new ManagedProject30MakefileTests("test30_2"));
@@ -392,6 +393,21 @@ public class ManagedProject30MakefileTests extends TestCase {
 		buildDegenerativeProjects(projects, makefiles);			
 	}
 
+	/**
+	 * (non-Javadoc)
+	 * tests 3.0 managed build system with a project which has a file with no file extesnion
+	 */
+	public void testFileWithNoExtension()
+	{
+		IPath[] makefiles = {
+				 Path.fromOSString("makefile"), 
+				 Path.fromOSString("objects.mk"), 
+				 Path.fromOSString("sources.mk"), 
+				 Path.fromOSString("subdir.mk")};
+		IProject[] projects = createProjects("testFileWithNoExtension", null, null, true);
+		buildProjects(projects, makefiles);
+	}
+	
 	/* (non-Javadoc)
 	 * tests 3.0 style tool integration: create pre-build and post-build steps and verify that 
 	 * the proper commands are generated in the makefile which is created by the managedbuild system
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/ManagedBuildGnuToolInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/ManagedBuildGnuToolInfo.java
index ccdb97805cf..36db0023288 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/ManagedBuildGnuToolInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/ManagedBuildGnuToolInfo.java
@@ -228,6 +228,13 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo {
 								for (int j=0; j<projResources.length; j++) {
 									if (projResources[j].getType() == IResource.FILE) {
 										String fileExt = projResources[j].getFileExtension();
+										
+										// fix for NPE, bugzilla 99483
+										if(fileExt == null)
+										{
+											fileExt = "";
+										}
+										
 										for (int k=0; k<exts.length; k++) {
 											if (fileExt.equals(exts[k])) {
 												if (!useFileExts) {