Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java,v
diff -u -r1.26 -r1.27
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	30 Apr 2008 05:35:47 -0000	1.26
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	5 May 2008 05:26:56 -0000	1.27
@@ -278,8 +278,8 @@
 			Iterator iter = savedFiles.iterator();
 			while (iter.hasNext()) {
 				currAtt = (ChatAttachment) iter.next();
-				if (StringUtils.equals(currAtt.getFileName(), newAtt
-						.getFileName())) {
+				if (StringUtils.equals(currAtt.getFileName(), newAtt.getFileName())
+						&& StringUtils.equals(currAtt.getFileType(), newAtt.getFileType())) {
 					// move from this this list to deleted list.
 					getAttList(KEY_DELETED_FILES, map).add(currAtt);
 					iter.remove();
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java,v
diff -u -r1.66 -r1.67
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	24 May 2007 00:13:31 -0000	1.66
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	5 May 2008 05:26:57 -0000	1.67
@@ -469,7 +469,8 @@
 		Attachment existAtt;
 		while(iter.hasNext()){
 			existAtt = (Attachment) iter.next();
-			if(StringUtils.equals(existAtt.getFileName(),att.getFileName())){
+			if (StringUtils.equals(existAtt.getFileName(), att.getFileName())
+					&& StringUtils.equals(existAtt.getFileType(), att.getFileType())) {
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v
diff -u -r1.47 -r1.48
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	9 Oct 2007 03:37:11 -0000	1.47
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	5 May 2008 05:26:57 -0000	1.48
@@ -679,7 +679,8 @@
 		ResourceAttachment existAtt;
 		while(iter.hasNext()){
 			existAtt = (ResourceAttachment) iter.next();
-			if(StringUtils.equals(existAtt.getFileName(),att.getFileName())){
+			if (StringUtils.equals(existAtt.getFileName(), att.getFileName())
+					&& StringUtils.equals(existAtt.getFileType(), att.getFileType())) {
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java,v
diff -u -r1.15 -r1.16
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	30 Apr 2008 05:20:16 -0000	1.15
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	5 May 2008 05:26:59 -0000	1.16
@@ -281,8 +281,8 @@
 			Iterator iter = savedFiles.iterator();
 			while (iter.hasNext()) {
 				currAtt = (NotebookAttachment) iter.next();
-				if (StringUtils.equals(currAtt.getFileName(), newAtt
-						.getFileName())) {
+				if (StringUtils.equals(currAtt.getFileName(), newAtt.getFileName())
+						&& StringUtils.equals(currAtt.getFileType(), newAtt.getFileType())) {
 					// move from this this list to deleted list.
 					getAttList(KEY_DELETED_FILES, map).add(currAtt);
 					iter.remove();
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java,v
diff -u -r1.37 -r1.38
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	9 Oct 2007 01:26:13 -0000	1.37
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	5 May 2008 05:26:56 -0000	1.38
@@ -323,7 +323,8 @@
 		InstructionFiles existAtt;
 		while(iter.hasNext()){
 			existAtt = (InstructionFiles) iter.next();
-			if(StringUtils.equals(existAtt.getName(),att.getName())){
+			if (StringUtils.equals(existAtt.getName(), att.getName())
+					&& StringUtils.equals(existAtt.getType(), att.getType())) {
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java,v
diff -u -r1.13 -r1.14
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java	30 Apr 2008 05:35:11 -0000	1.13
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java	5 May 2008 05:26:58 -0000	1.14
@@ -446,8 +446,8 @@
 			Iterator iter = savedFiles.iterator();
 			while (iter.hasNext()) {
 				currAtt = (ScribeAttachment) iter.next();
-				if (StringUtils.equals(currAtt.getFileName(), newAtt
-						.getFileName())) {
+				if (StringUtils.equals(currAtt.getFileName(), newAtt.getFileName())
+						&& StringUtils.equals(currAtt.getFileType(), newAtt.getFileType())) {
 					// move from this this list to deleted list.
 					getAttList(KEY_DELETED_FILES, map).add(currAtt);
 					iter.remove();
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java,v
diff -u -r1.16 -r1.17
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	14 Dec 2006 03:08:16 -0000	1.16
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	5 May 2008 05:26:57 -0000	1.17
@@ -677,7 +677,8 @@
 		SurveyAttachment existAtt;
 		while(iter.hasNext()){
 			existAtt = (SurveyAttachment) iter.next();
-			if(StringUtils.equals(existAtt.getFileName(),att.getFileName())){
+			if(StringUtils.equals(existAtt.getFileName(),att.getFileName())
+					&& StringUtils.equals(existAtt.getFileType(),att.getFileType())){
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java,v
diff -u -r1.8 -r1.9
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	15 Apr 2008 11:03:27 -0000	1.8
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	5 May 2008 05:26:55 -0000	1.9
@@ -561,7 +561,8 @@
 		TaskListAttachment existAtt;
 		while(iter.hasNext()){
 			existAtt = (TaskListAttachment) iter.next();
-			if(StringUtils.equals(existAtt.getFileName(),att.getFileName())){
+			if(StringUtils.equals(existAtt.getFileName(),att.getFileName())
+					&& StringUtils.equals(existAtt.getFileType(),att.getFileType())){
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();