mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 17:55:39 +02:00
Code Issues Wiki Activity

null pointer check for src and host encodings

Browse source
This commit is contained in:
David McKnight 2006-06-05 19:57:58 +00:00
parent 39601be439
commit bbb239d566
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java
View file

@ -224,7 +224,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
String byteStreamHandlerId = getByteStreamHandlerId(); String byteStreamHandlerId = getByteStreamHandlerId();
String remotePath = remoteParent + getSeparator(remoteParent) + remoteFile; String remotePath = remoteParent + getSeparator(remoteParent) + remoteFile;
if (!isBinary) if (!isBinary && hostEncoding != null)
{ {
String tempStr = new String(buffer, 0, bytesRead); String tempStr = new String(buffer, 0, bytesRead);
@ -393,7 +393,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
String byteStreamHandlerId = getByteStreamHandlerId(); String byteStreamHandlerId = getByteStreamHandlerId();
String remotePath = remoteParent + getSeparator(remoteParent) + remoteFile; String remotePath = remoteParent + getSeparator(remoteParent) + remoteFile;
if (!isBinary) if (!isBinary && srcEncoding != null && hostEncoding != null)
{ {
String tempStr = new String(buffer, 0, bytesRead, srcEncoding); String tempStr = new String(buffer, 0, bytesRead, srcEncoding);